diff --git a/rtgui/splash.cc b/rtgui/splash.cc
index 0c1c56397..576692690 100644
--- a/rtgui/splash.cc
+++ b/rtgui/splash.cc
@@ -255,29 +255,6 @@ Splash::Splash (Gtk::Window& parent) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, t
     set_keep_above (true);
 }
 
-Splash::Splash (Gtk::Window& parent, int maxtime) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, true)
-{
-
-    splashImage = Gtk::manage(new SplashImage ());
-    get_content_area()->pack_start (*splashImage);
-    splashImage->show ();
-
-    if (maxtime > 0) {
-        Glib::signal_timeout().connect (sigc::mem_fun(*this, &Splash::on_timer), maxtime);
-    }
-
-    set_position (Gtk::WIN_POS_CENTER);
-
-    if (maxtime > 0) {
-        set_decorated (false);
-    }
-
-    add_events(Gdk::BUTTON_RELEASE_MASK);
-    set_resizable (false);
-
-    set_keep_above (true);
-}
-
 bool Splash::on_timer ()
 {
 
diff --git a/rtgui/splash.h b/rtgui/splash.h
index 3fea9fdd1..4769700f6 100644
--- a/rtgui/splash.h
+++ b/rtgui/splash.h
@@ -48,7 +48,6 @@ private:
     Gtk::ScrolledWindow* releaseNotesSW;
 
 public:
-    Splash (Gtk::Window& parent, int maxtime);
     explicit Splash (Gtk::Window& parent);
 
     bool hasReleaseNotes()
diff --git a/rtgui/thumbbrowserbase.cc b/rtgui/thumbbrowserbase.cc
index deb423569..b5fa6c21f 100644
--- a/rtgui/thumbbrowserbase.cc
+++ b/rtgui/thumbbrowserbase.cc
@@ -25,7 +25,7 @@
 using namespace std;
 
 ThumbBrowserBase::ThumbBrowserBase ()
-    : location(THLOC_FILEBROWSER), inspector(nullptr), isInspectorActive(false), lastClicked(nullptr), previewHeight(options.thumbSize), numOfCols(1)
+    : location(THLOC_FILEBROWSER), inspector(nullptr), isInspectorActive(false), eventTime(0), lastClicked(nullptr), previewHeight(options.thumbSize), numOfCols(1)
 {
     inW = -1;
     inH = -1;
diff --git a/rtgui/toolbar.cc b/rtgui/toolbar.cc
index e070a9162..6c44abe57 100644
--- a/rtgui/toolbar.cc
+++ b/rtgui/toolbar.cc
@@ -21,7 +21,7 @@
 #include "multilangmgr.h"
 #include "guiutils.h"
 
-ToolBar::ToolBar () : showColPickers(true), listener (nullptr)
+ToolBar::ToolBar () : showColPickers(true), listener (nullptr), pickerListener(nullptr)
 {
 
     editingMode = false;
diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc
index 7920b7a9b..2f37f8c2e 100644
--- a/rtgui/toolpanelcoord.cc
+++ b/rtgui/toolpanelcoord.cc
@@ -28,7 +28,7 @@
 
 using namespace rtengine::procparams;
 
-ToolPanelCoordinator::ToolPanelCoordinator () : ipc(nullptr), editDataProvider(nullptr)
+ToolPanelCoordinator::ToolPanelCoordinator () : ipc(nullptr), hasChanged(false), editDataProvider(nullptr)
 {
 
     exposurePanel   = Gtk::manage (new ToolVBox ());
@@ -509,11 +509,11 @@ void ToolPanelCoordinator::initImage (rtengine::StagedImageProcessor* ipc_, bool
     toneCurve->enableAll ();
     toneCurve->enableListener ();
 
-    const rtengine::ImageMetaData* pMetaData = ipc->getInitialImage()->getMetaData();
-    exifpanel->setImageData (pMetaData);
-    iptcpanel->setImageData (pMetaData);
-
     if (ipc) {
+        const rtengine::ImageMetaData* pMetaData = ipc->getInitialImage()->getMetaData();
+        exifpanel->setImageData (pMetaData);
+        iptcpanel->setImageData (pMetaData);
+
         ipc->setAutoExpListener (toneCurve);
         ipc->setAutoCamListener (colorappearance);
         ipc->setAutoBWListener (blackwhite);
@@ -526,12 +526,12 @@ void ToolPanelCoordinator::initImage (rtengine::StagedImageProcessor* ipc_, bool
         ipc->setSizeListener (crop);
         ipc->setSizeListener (resize);
         ipc->setImageTypeListener (this);
+        flatfield->setShortcutPath(Glib::path_get_dirname(ipc->getInitialImage()->getFileName()));
+
+        icm->setRawMeta (raw, (const rtengine::ImageData*)pMetaData);
+        lensProf->setRawMeta (raw, pMetaData);
     }
 
-    flatfield->setShortcutPath(Glib::path_get_dirname(ipc->getInitialImage()->getFileName()));
-
-    icm->setRawMeta (raw, (const rtengine::ImageData*)pMetaData);
-    lensProf->setRawMeta (raw, pMetaData);
 
     toneCurve->setRaw (raw);
     hasChanged = true;
diff --git a/rtgui/toolpanelcoord.h b/rtgui/toolpanelcoord.h
index 4dedf7dad..cfb85e372 100644
--- a/rtgui/toolpanelcoord.h
+++ b/rtgui/toolpanelcoord.h
@@ -170,19 +170,6 @@ protected:
     TextOrIcon* toiM;
     TextOrIcon* toiW;
 
-    Gtk::Label* labelE;
-    Gtk::Label* labelD;
-    Gtk::Label* labelC;
-    Gtk::Label* labelT;
-    Gtk::Label* labelR;
-    Gtk::Label* labelM;
-
-    Gtk::Image* imgIconE;
-    Gtk::Image* imgIconD;
-    Gtk::Image* imgIconC;
-    Gtk::Image* imgIconT;
-    Gtk::Image* imgIconR;
-    Gtk::Image* imgIconM;
     Gtk::Image* imgPanelEnd[6];
     Gtk::VBox* vbPanelEnd[6];
 
diff --git a/rtgui/whitebalance.cc b/rtgui/whitebalance.cc
index 135d30655..d16dafa08 100644
--- a/rtgui/whitebalance.cc
+++ b/rtgui/whitebalance.cc
@@ -428,7 +428,7 @@ void WhiteBalance::optChanged ()
             equal->setEditedState (UnEdited);
             tempBias->setEditedState (UnEdited);
         } else {
-            int methodId = findWBEntryId (row[methodColumns.colLabel], WBLT_GUI);
+            unsigned int methodId = findWBEntryId (row[methodColumns.colLabel], WBLT_GUI);
             WBEntry* currMethod = WBParams::wbEntries[methodId];
 
             tempBias->set_sensitive(currMethod->type == WBT_AUTO);
@@ -792,7 +792,7 @@ void WhiteBalance::cache_customWB(int temp, double green)
     cache_customGreen (green);
 }
 
-int WhiteBalance::findWBEntryId (Glib::ustring label, enum WB_LabelType lblType)
+unsigned int WhiteBalance::findWBEntryId (const Glib::ustring &label, enum WB_LabelType lblType)
 {
     for (unsigned int i = 0; i < WBParams::wbEntries.size(); i++) {
         if (label == (lblType == WBLT_GUI ? WBParams::wbEntries[i]->GUILabel : WBParams::wbEntries[i]->ppLabel)) {
@@ -800,7 +800,7 @@ int WhiteBalance::findWBEntryId (Glib::ustring label, enum WB_LabelType lblType)
         }
     }
 
-    return -1;
+    return 0; // default to camera wb
 }
 
 WBEntry* WhiteBalance::findWBEntry (Glib::ustring label, enum WB_LabelType lblType)
diff --git a/rtgui/whitebalance.h b/rtgui/whitebalance.h
index 1d493c035..7366e55b5 100644
--- a/rtgui/whitebalance.h
+++ b/rtgui/whitebalance.h
@@ -86,7 +86,7 @@ protected:
     int _setActiveMethod   (Glib::ustring &label, Gtk::TreeModel::Children &children);
 
     Gtk::TreeModel::Row            getActiveMethod ();
-    int                            findWBEntryId   (Glib::ustring label, enum WB_LabelType lblType = WBLT_GUI);
+    unsigned int                   findWBEntryId   (const Glib::ustring &label, enum WB_LabelType lblType = WBLT_GUI);
     rtengine::procparams::WBEntry* findWBEntry     (Glib::ustring label, enum WB_LabelType lblType = WBLT_GUI);
 
 public: