diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc
index b9c66f6e0..097ef2806 100644
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -1893,7 +1893,7 @@ void EditorPanel::sendToGimpPressed ()
 }
 
 
-bool EditorPanel::saveImmediately(const Glib::ustring &filename, SaveFormat sf)
+bool EditorPanel::saveImmediately(const Glib::ustring &filename, const SaveFormat &sf)
 {
     rtengine::procparams::ProcParams pparams;
     ipc->getParams (&pparams);
diff --git a/rtgui/editorpanel.h b/rtgui/editorpanel.h
index 676395b4a..050909d7d 100644
--- a/rtgui/editorpanel.h
+++ b/rtgui/editorpanel.h
@@ -131,7 +131,7 @@ public:
 
     void defaultMonitorProfileChanged(const Glib::ustring &profile_name, bool auto_monitor_profile);
 
-    bool saveImmediately(const Glib::ustring &filename, SaveFormat sf);
+    bool saveImmediately(const Glib::ustring &filename, const SaveFormat &sf);
 
     Gtk::Paned* catalogPane;
 
diff --git a/rtgui/filepanel.cc b/rtgui/filepanel.cc
index 035b4e2db..1ac4046b6 100644
--- a/rtgui/filepanel.cc
+++ b/rtgui/filepanel.cc
@@ -190,7 +190,6 @@ void FilePanel::init ()
     dirBrowser->fillDirTree ();
     placesBrowser->refreshPlacesList ();
 
-    //if (argv1 != "" && Glib::file_test (argv1, Glib::FILE_TEST_IS_DIR)) {
     if (!argv1.empty() && Glib::file_test (argv1, Glib::FILE_TEST_EXISTS)) {
         Glib::ustring d(argv1);
         if (!Glib::file_test(d, Glib::FILE_TEST_IS_DIR)) {
diff --git a/rtgui/main.cc b/rtgui/main.cc
index e096e23dc..41891b995 100644
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@@ -294,8 +294,6 @@ int main(int argc, char **argv)
 
 #endif
 
-    //simpleEditor = false;
-
     if (!argv1.empty()) {
         if( Glib::file_test(argv1, Glib::FILE_TEST_EXISTS) && !Glib::file_test(argv1, Glib::FILE_TEST_IS_DIR)) {
             simpleEditor = true;
diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc
index a34843d38..e40d95f15 100644
--- a/rtgui/rtwindow.cc
+++ b/rtgui/rtwindow.cc
@@ -287,8 +287,7 @@ RTWindow::RTWindow ()
         if (!argv1.empty()) {
             Thumbnail* thm = cacheMgr->getEntry(argv1);
             if (thm) {
-                std::vector<Thumbnail *> entries(1, thm);
-                fpanel->fileCatalog->openRequested(entries);
+                fpanel->fileCatalog->openRequested({thm});
             }
         }
     }