diff --git a/rtengine/ipwavelet.cc b/rtengine/ipwavelet.cc
index f1f9a53e5..a5c9b6d7a 100644
--- a/rtengine/ipwavelet.cc
+++ b/rtengine/ipwavelet.cc
@@ -1258,7 +1258,7 @@ SSEFUNCTION void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int
     omp_set_nested(oldNested);
 #endif
 
-    if(numtiles > 1) {
+    if(numtiles != 1) {
         dst->CopyFrom(dsttmp);
         delete dsttmp;
     }
diff --git a/rtgui/filebrowserentry.cc b/rtgui/filebrowserentry.cc
index 59655235f..9bce8575a 100644
--- a/rtgui/filebrowserentry.cc
+++ b/rtgui/filebrowserentry.cc
@@ -60,9 +60,7 @@ FileBrowserEntry::FileBrowserEntry (Thumbnail* thm, const Glib::ustring& fname)
         iconsLoaded = true;
     }
 
-    if (thm) {
-        thm->addThumbnailListener (this);
-    }
+    thumbnail->addThumbnailListener (this);
 }
 
 FileBrowserEntry::~FileBrowserEntry ()
diff --git a/rtgui/mydiagonalcurve.cc b/rtgui/mydiagonalcurve.cc
index 7ee619036..d249d4439 100644
--- a/rtgui/mydiagonalcurve.cc
+++ b/rtgui/mydiagonalcurve.cc
@@ -1111,8 +1111,10 @@ bool MyDiagonalCurve::pipetteButton1Pressed(EditDataProvider *provider, int modi
             curve.y.insert (ity, 0);
 
             // the graph is refreshed only if a new point is created (snapped to a pixel)
-            curve.x.at(lit_point) = clampedX;
-            curve.y.at(lit_point) = clampedY;
+            if (lit_point >= 0) {
+                curve.x.at(lit_point) = clampedX;
+                curve.y.at(lit_point) = clampedY;
+            }
 
             if (lit_point > -1 && grab_point == -1 && coordinateAdjuster->is_visible()) {
                 std::vector<double> position;