diff --git a/CMakeLists.txt b/CMakeLists.txt
index aff360083..bffa9bfac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,7 +183,7 @@ if (WIN32)
 endif (WIN32)
 # you may need lcms v1.xx for older version : pkg_check_modules (LCMS REQUIRED lcms<=1.99)
 pkg_check_modules (LCMS REQUIRED lcms2)
-pkg_check_modules (EXPAT REQUIRED expat>=2.0)
+find_package (EXPAT REQUIRED expat>=2.0)
 pkg_check_modules (IPTCDATA REQUIRED libiptcdata)
 find_package (JPEG REQUIRED)
 find_package (PNG REQUIRED)
diff --git a/rtengine/lcp.cc b/rtengine/lcp.cc
index d3db3ae57..e03d8e8d6 100644
--- a/rtengine/lcp.cc
+++ b/rtengine/lcp.cc
@@ -206,7 +206,7 @@ void XMLCALL LCPProfile::XmlStartHandler(void *pLCPProfile, const char *el, cons
     LCPProfile *pProf=static_cast<LCPProfile*>(pLCPProfile);
 
     // clean up tagname
-    char* src=strrchr(el,':');
+    const char* src=strrchr(el,':');
     if (src==NULL) src=const_cast<char*>(el); else src++;
 
     strcpy(pProf->lastTag,src);
diff --git a/rtgui/lensprofile.cc b/rtgui/lensprofile.cc
index f93670525..2793d4ee9 100644
--- a/rtgui/lensprofile.cc
+++ b/rtgui/lensprofile.cc
@@ -68,6 +68,8 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
 
     if (pp->lensProf.lcpFile.length()>0 && lcpStore->isValidLCPFileName(pp->lensProf.lcpFile))
         fcbLCPFile->set_filename (pp->lensProf.lcpFile);
+    else
+        fcbLCPFile->unselect_filename(fcbLCPFile->get_filename());
 
     lcpFileChanged = false;