diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc
index 8ffc504f3..401e41f1e 100644
--- a/rtengine/rtthumbnail.cc
+++ b/rtengine/rtthumbnail.cc
@@ -742,14 +742,14 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, int rhei
     hist16.clear();
     for (int i=0; i<fh; i++)
         for (int j=0; j<fw; j++)
-            hist16[(int)(2*(labView->L[i][j]))]++;
+            hist16[CLIP((int)((labView->L[i][j])))]++;
 
     // luminance processing
     CurveFactory::complexLCurve (params.labCurve.brightness, params.labCurve.contrast, params.labCurve.lcurve, 
         hist16, hist16, curve, dummy, 16);
-    ipf.luminanceCurve (labView, labView, curve);
-	CurveFactory::complexsgnCurve (params.labCurve.saturation, params.labCurve.enable_saturationlimiter, params.labCurve.saturationlimit, \
+    CurveFactory::complexsgnCurve (params.labCurve.saturation, params.labCurve.enable_saturationlimiter, params.labCurve.saturationlimit, \
 								   params.labCurve.acurve, params.labCurve.bcurve, curve1, curve2, satcurve, 16);
+    ipf.luminanceCurve (labView, labView, curve);
     ipf.chrominanceCurve (labView, labView, curve1, curve2, satcurve);
 	ipf.vibrance(labView);
 
diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc
index fc728964a..b3ccfe5a6 100644
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -172,9 +172,10 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p
     // luminance processing
 
 	CurveFactory::complexLCurve (params.labCurve.brightness, params.labCurve.contrast, params.labCurve.lcurve, hist16, hist16, curve, dummy, 1);
-	ipf.luminanceCurve (labView, labView, curve);
+
 	CurveFactory::complexsgnCurve (params.labCurve.saturation, params.labCurve.enable_saturationlimiter, params.labCurve.saturationlimit, \
 								   params.labCurve.acurve, params.labCurve.bcurve, curve1, curve2, satcurve, 1);
+	ipf.luminanceCurve (labView, labView, curve);
 	ipf.chrominanceCurve (labView, labView, curve1, curve2, satcurve);
 	ipf.vibrance(labView);
 
diff --git a/rtgui/lensgeom.cc b/rtgui/lensgeom.cc
index 8a6b9acdc..2e29bc2cf 100644
--- a/rtgui/lensgeom.cc
+++ b/rtgui/lensgeom.cc
@@ -93,9 +93,9 @@ void LensGeometry::fillPressed () {
 
     if (listener) {
     	if (fill->get_active ())
-    		listener->panelChanged (EvTransAutoFill, M("TP_LENSGEOM_AUTOFILL")+' '+M("GENERAL_ENABLED"));
+    		listener->panelChanged (EvTransAutoFill, M("GENERAL_ENABLED"));
     	else
-    		listener->panelChanged (EvTransAutoFill, M("TP_LENSGEOM_AUTOFILL")+' '+M("GENERAL_DISABLED"));
+    		listener->panelChanged (EvTransAutoFill, M("GENERAL_DISABLED"));
     }
 }