diff --git a/rtgui/lensprofile.cc b/rtgui/lensprofile.cc
index 58f4fa339..7b085278e 100644
--- a/rtgui/lensprofile.cc
+++ b/rtgui/lensprofile.cc
@@ -80,11 +80,13 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
 {
     disableListener ();
 
-    if (pp->lensProf.lcpFile.length()>0 && lcpStore->isValidLCPFileName(pp->lensProf.lcpFile)) {
+    if (!pp->lensProf.lcpFile.empty() && lcpStore->isValidLCPFileName(pp->lensProf.lcpFile)) {
         fcbLCPFile->set_filename (pp->lensProf.lcpFile);
         updateDisabled(true);
     } else {
-        fcbLCPFile->unselect_filename(fcbLCPFile->get_filename());
+        Glib::ustring fname = fcbLCPFile->get_filename();
+        if (!pp->lensProf.lcpFile.empty())
+            fcbLCPFile->unselect_filename(fname);
         updateDisabled(false);
     }
 
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index e5424286b..d7f9649e4 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -710,7 +710,6 @@ Gtk::Widget* Preferences::getGeneralPanel () {
     hb6->set_border_width (4);
     hb6->set_spacing (4);
     Gtk::Label* dflab = Gtk::manage( new Gtk::Label (M("PREFERENCES_DATEFORMAT")+":", Gtk::ALIGN_LEFT));
-    hb6->pack_start (*dflab, Gtk::PACK_SHRINK,4);
     dateformat = Gtk::manage( new Gtk::Entry () );
     dateformat->set_tooltip_markup (M("PREFERENCES_DATEFORMATHINT"));
     dflab->set_tooltip_markup (M("PREFERENCES_DATEFORMATHINT"));