diff --git a/rtengine/lcp.cc b/rtengine/lcp.cc
index e367633f2..821194afe 100644
--- a/rtengine/lcp.cc
+++ b/rtengine/lcp.cc
@@ -191,7 +191,9 @@ LCPMapper::LCPMapper(LCPProfile* pProf, float focalLength, float focalLength35mm
     swapXY  = (rot == 90  || rot == 270);
     bool mirrorX = (rot == 90  || rot == 180);
     bool mirrorY = (rot == 180 || rot == 270);
-    //printf("Vign: %i, fullWidth: %i/%i, focLen %g SwapXY: %i / MirX/Y %i / %i on rot:%i from %i\n",vignette, fullWidth, fullHeight, focalLength, swapXY, mirrorX, mirrorY, rot, rawRotationDeg);
+    if (settings->verbose) {
+        printf("Vign: %i, fullWidth: %i/%i, focLen %g SwapXY: %i / MirX/Y %i / %i on rot:%i from %i\n",vignette, fullWidth, fullHeight, focalLength, swapXY, mirrorX, mirrorY, rot, rawRotationDeg);
+    }
 
     pProf->calcParams(vignette ? 0 : 1, focalLength, focusDist, aperture, &mc, nullptr, nullptr);
     mc.prepareParams(fullWidth, fullHeight, focalLength, focalLength35mm, pProf->sensorFormatFactor, swapXY, mirrorX, mirrorY);
@@ -400,7 +402,9 @@ LCPProfile::LCPProfile(const Glib::ustring &fname)
 
     XML_ParserFree(parser);
 
-    //printf("Parsing %s\n", fname.c_str());
+    if (settings->verbose) {
+        printf("Parsing %s\n", fname.c_str());
+    }
     // Two phase filter: first filter out the very rough ones, that distord the average a lot
     // force it, even if there are few frames (community profiles)
     filterBadFrames(2.0, 0);
@@ -468,7 +472,9 @@ int LCPProfile::filterBadFrames(double maxAvgDevFac, int minFramesLeft)
             }
         }
 
-        //printf("Filtered %.1f%% frames for maxAvgDevFac %g leaving %i\n", filtered*100./(baseCount+chromCount+vignetteCount), maxAvgDevFac, baseCount+chromCount+vignetteCount-filtered);
+        if (settings->verbose) {
+            printf("Filtered %.1f%% frames for maxAvgDevFac %g leaving %i\n", filtered*100./(baseCount+chromCount+vignetteCount), maxAvgDevFac, baseCount+chromCount+vignetteCount-filtered);
+        }
     }
 
     return filtered;
@@ -608,7 +614,9 @@ void LCPProfile::calcParams(int mode, float focalLength, float focusDist, float
             break;
         }
 
-        //printf("LCP mode=%i, dist: %g found frames: Fno %g-%g; FocLen %g-%g; Dist %g-%g with weight %g\n", mode, focusDist, pLow->aperture, pHigh->aperture, pLow->focLen, pHigh->focLen, pLow->focDist, pHigh->focDist, facLow);
+        if (settings->verbose) {
+            printf("LCP mode=%i, dist: %g found frames: Fno %g-%g; FocLen %g-%g; Dist %g-%g with weight %g\n", mode, focusDist, pLow->aperture, pHigh->aperture, pLow->focLen, pHigh->focLen, pLow->focDist, pHigh->focDist, facLow);
+        }
     } else {
         if (settings->verbose) {
             printf("Error: LCP file contained no %s parameters\n", mode == 0 ? "vignette" : mode == 1 ? "distortion" : "CA" );
@@ -894,7 +902,9 @@ LCPProfile* LCPStore::getProfile (Glib::ustring filename)
 
     // Add profile (if exists)
     profileCache[filename] = new LCPProfile(filename);
-    //profileCache[filename]->print();
+    if (settings->verbose) {
+        profileCache[filename]->print();
+    }
     return profileCache[filename];
 }
 
diff --git a/rtgui/cropwindow.cc b/rtgui/cropwindow.cc
index 5dde256f6..0694f68ea 100644
--- a/rtgui/cropwindow.cc
+++ b/rtgui/cropwindow.cc
@@ -40,7 +40,8 @@ CropWindow::CropWindow (ImageArea* parent, bool isLowUpdatePriority_, bool isDet
       backColor(options.bgcolor), decorated(true), isFlawnOver(false), titleHeight(30), sideBorderWidth(3), lowerBorderWidth(3),
       upperBorderWidth(1), sepWidth(2), xpos(30), ypos(30), width(0), height(0), imgAreaX(0), imgAreaY(0), imgAreaW(0), imgAreaH(0),
       imgX(-1), imgY(-1), imgW(1), imgH(1), iarea(parent), cropZoom(0), zoomVersion(0), exposeVersion(0), cropgl(nullptr),
-      pmlistener(nullptr), pmhlistener(nullptr), observedCropWin(nullptr)
+      pmlistener(nullptr), pmhlistener(nullptr), observedCropWin(nullptr),
+      crop_custom_ratio(0.f)
 {
     initZoomSteps();
     
@@ -337,6 +338,11 @@ void CropWindow::buttonPress (int button, int type, int bstate, int x, int y)
                 press_y = height;
             } else {
                 if (onArea (CropImage, x, y)) {  // events inside of the image domain
+                    crop_custom_ratio = 0.f;
+                    if ((bstate & GDK_SHIFT_MASK) && cropHandler.cropParams.w > 0 && cropHandler.cropParams.h > 0) {
+                        crop_custom_ratio = float(cropHandler.cropParams.w) / float(cropHandler.cropParams.h);
+                    }
+                    
                     if (iarea->getToolMode () == TMColorPicker) {
                         if (hoveredPicker) {
                             if ((bstate & GDK_CONTROL_MASK) && !(bstate & GDK_SHIFT_MASK)) {
@@ -759,8 +765,6 @@ void CropWindow::pointerMoved (int bstate, int x, int y)
 
     EditSubscriber *editSubscriber = iarea->getCurrSubscriber();
 
-    float cur_crop_ratio = (bstate & GDK_SHIFT_MASK) && cropHandler.cropParams.w > 0 && cropHandler.cropParams.h > 0 ? float(cropHandler.cropParams.w) / float(cropHandler.cropParams.h) : 0.0;
-
     if (state == SCropWinMove) {
         setPosition (press_x + x - action_x, press_y + y - action_y);
         iarea->redraw ();
@@ -809,21 +813,21 @@ void CropWindow::pointerMoved (int bstate, int x, int y)
         int oy = cropHandler.cropParams.y;
         cropHandler.cropParams.y = action_y + (y - press_y) / zoomSteps[cropZoom].zoom;
         cropHandler.cropParams.h += oy - cropHandler.cropParams.y;
-        cropgl->cropHeight1Resized (cropHandler.cropParams.x, cropHandler.cropParams.y, cropHandler.cropParams.w, cropHandler.cropParams.h, cur_crop_ratio);
+        cropgl->cropHeight1Resized (cropHandler.cropParams.x, cropHandler.cropParams.y, cropHandler.cropParams.w, cropHandler.cropParams.h, crop_custom_ratio);
         iarea->redraw ();
     } else if (state == SResizeH2 && cropgl) {
         cropHandler.cropParams.h = action_y + (y - press_y) / zoomSteps[cropZoom].zoom;
-        cropgl->cropHeight2Resized (cropHandler.cropParams.x, cropHandler.cropParams.y, cropHandler.cropParams.w, cropHandler.cropParams.h, cur_crop_ratio);
+        cropgl->cropHeight2Resized (cropHandler.cropParams.x, cropHandler.cropParams.y, cropHandler.cropParams.w, cropHandler.cropParams.h, crop_custom_ratio);
         iarea->redraw ();
     } else if (state == SResizeW1 && cropgl) {
         int ox = cropHandler.cropParams.x;
         cropHandler.cropParams.x = action_x + (x - press_x) / zoomSteps[cropZoom].zoom;
         cropHandler.cropParams.w += ox - cropHandler.cropParams.x;
-        cropgl->cropWidth1Resized (cropHandler.cropParams.x, cropHandler.cropParams.y, cropHandler.cropParams.w, cropHandler.cropParams.h, cur_crop_ratio);
+        cropgl->cropWidth1Resized (cropHandler.cropParams.x, cropHandler.cropParams.y, cropHandler.cropParams.w, cropHandler.cropParams.h, crop_custom_ratio);
         iarea->redraw ();
     } else if (state == SResizeW2 && cropgl) {
         cropHandler.cropParams.w = action_x + (x - press_x) / zoomSteps[cropZoom].zoom;
-        cropgl->cropWidth2Resized (cropHandler.cropParams.x, cropHandler.cropParams.y, cropHandler.cropParams.w, cropHandler.cropParams.h, cur_crop_ratio);
+        cropgl->cropWidth2Resized (cropHandler.cropParams.x, cropHandler.cropParams.y, cropHandler.cropParams.w, cropHandler.cropParams.h, crop_custom_ratio);
         iarea->redraw ();
     } else if (state == SResizeTL && cropgl) {
         int ox = cropHandler.cropParams.x;
@@ -832,26 +836,26 @@ void CropWindow::pointerMoved (int bstate, int x, int y)
         int oy = cropHandler.cropParams.y;
         cropHandler.cropParams.y = action_y + (y - press_y) / zoomSteps[cropZoom].zoom;
         cropHandler.cropParams.h += oy - cropHandler.cropParams.y;
-        cropgl->cropTopLeftResized (cropHandler.cropParams.x, cropHandler.cropParams.y, cropHandler.cropParams.w, cropHandler.cropParams.h, cur_crop_ratio);
+        cropgl->cropTopLeftResized (cropHandler.cropParams.x, cropHandler.cropParams.y, cropHandler.cropParams.w, cropHandler.cropParams.h, crop_custom_ratio);
         iarea->redraw ();
     } else if (state == SResizeTR && cropgl) {
         cropHandler.cropParams.w = action_x + (x - press_x) / zoomSteps[cropZoom].zoom;
         int oy = cropHandler.cropParams.y;
         cropHandler.cropParams.y = action_y + (y - press_y) / zoomSteps[cropZoom].zoom;
         cropHandler.cropParams.h += oy - cropHandler.cropParams.y;
-        cropgl->cropTopRightResized (cropHandler.cropParams.x, cropHandler.cropParams.y, cropHandler.cropParams.w, cropHandler.cropParams.h, cur_crop_ratio);
+        cropgl->cropTopRightResized (cropHandler.cropParams.x, cropHandler.cropParams.y, cropHandler.cropParams.w, cropHandler.cropParams.h, crop_custom_ratio);
         iarea->redraw ();
     } else if (state == SResizeBL && cropgl) {
         int ox = cropHandler.cropParams.x;
         cropHandler.cropParams.x = action_x + (x - press_x) / zoomSteps[cropZoom].zoom;
         cropHandler.cropParams.w += ox - cropHandler.cropParams.x;
         cropHandler.cropParams.h = action_y + (y - press_y) / zoomSteps[cropZoom].zoom;
-        cropgl->cropBottomLeftResized (cropHandler.cropParams.x, cropHandler.cropParams.y, cropHandler.cropParams.w, cropHandler.cropParams.h, cur_crop_ratio);
+        cropgl->cropBottomLeftResized (cropHandler.cropParams.x, cropHandler.cropParams.y, cropHandler.cropParams.w, cropHandler.cropParams.h, crop_custom_ratio);
         iarea->redraw ();
     } else if (state == SResizeBR && cropgl) {
         cropHandler.cropParams.w = action_x + (x - press_x) / zoomSteps[cropZoom].zoom;
         cropHandler.cropParams.h = action_y + (y - press_y) / zoomSteps[cropZoom].zoom;
-        cropgl->cropBottomRightResized (cropHandler.cropParams.x, cropHandler.cropParams.y, cropHandler.cropParams.w, cropHandler.cropParams.h, cur_crop_ratio);
+        cropgl->cropBottomRightResized (cropHandler.cropParams.x, cropHandler.cropParams.y, cropHandler.cropParams.w, cropHandler.cropParams.h, crop_custom_ratio);
         iarea->redraw ();
     } else if (state == SCropMove && cropgl) {
         cropHandler.cropParams.x = action_x + (x - press_x) / zoomSteps[cropZoom].zoom;
diff --git a/rtgui/cropwindow.h b/rtgui/cropwindow.h
index 3f80a75c4..c1d7c59cc 100644
--- a/rtgui/cropwindow.h
+++ b/rtgui/cropwindow.h
@@ -97,6 +97,8 @@ class CropWindow : public LWButtonListener, public CropDisplayHandler, public Ed
 
     CropWindow* observedCropWin;  // Pointer to the currently active detail CropWindow
 
+    float crop_custom_ratio;
+
     bool onArea                    (CursorArea a, int x, int y);
     void updateCursor              (int x, int y);
     void drawDecoration            (Cairo::RefPtr<Cairo::Context> cr);
diff --git a/rtgui/partialpastedlg.cc b/rtgui/partialpastedlg.cc
index d20615795..07bff8bf1 100644
--- a/rtgui/partialpastedlg.cc
+++ b/rtgui/partialpastedlg.cc
@@ -699,6 +699,8 @@ void PartialPasteDlg::applyPaste (rtengine::procparams::ProcParams* dstPP, Param
 
     // the general section is always ignored, whichever operation we use the PartialPaste for
     filterPE.general = falsePE.general;
+    // raw.caAutoStrength is ignored at the moment.
+    filterPE.raw.caAutoStrength = false;
 
 
     // Now we filter out the filter depending on the checked items