diff --git a/SConstruct b/SConstruct
index 7a1aa2592..3c49573da 100644
--- a/SConstruct
+++ b/SConstruct
@@ -93,10 +93,10 @@ def setupBasicEnvironment():
     appendVal(env,'DEBUG',    'CCFLAGS',   val=' -ggdb')
     
     # setup search path for Lumiera plugins
-    appendCppDefine(env,'PKGLIBDIR','LUMIERA_PLUGIN_PATH=\\"$PKGLIBDIR\\"'
-                                   ,'LUMIERA_PLUGIN_PATH=\\"$DESTDIR/lib/lumiera\\"') 
-    appendCppDefine(env,'PKGDATADIR','LUMIERA_CONFIG_PATH=\\"$PKGLIBDIR\\"'
-                                    ,'LUMIERA_CONFIG_PATH=\\"$DESTDIR/share/lumiera\\"') 
+    appendCppDefine(env,'PKGLIBDIR','LUMIERA_PLUGIN_PATH=\\"$PKGLIBDIR/:./.libs\\"'
+                                   ,'LUMIERA_PLUGIN_PATH=\\"$DESTDIR/lib/lumiera/:./.libs\\"') 
+    appendCppDefine(env,'PKGDATADIR','LUMIERA_CONFIG_PATH=\\"$PKGLIBDIR/:.\\"'
+                                    ,'LUMIERA_CONFIG_PATH=\\"$DESTDIR/share/lumiera/:.\\"') 
     
     prepareOptionsHelp(opts,env)
     opts.Save(OPTIONSCACHEFILE, env)
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 661c92f64..451b0a982 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -18,7 +18,7 @@
 liblumieracommon_la_srcdir = $(top_srcdir)/src/common
 lib_LTLIBRARIES += liblumieracommon.la
 
-liblumieracommon_la_CPPFLAGS = $(AM_CPPFLAGS)  -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\"" -DLUMIERA_PLUGIN_PATH="\"$(pkglibdir)/\""
+liblumieracommon_la_CPPFLAGS = $(AM_CPPFLAGS)  -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config:.\"" -DLUMIERA_PLUGIN_PATH="\"$(pkglibdir)/:./.libs\""
 liblumieracommon_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
 liblumieracommon_la_CXXFLAGS = $(AM_CXXFLAGS) -Wextra -Wall
 liblumieracommon_la_LIBADD = liblumiera.la
diff --git a/src/gui/window-manager.cpp b/src/gui/window-manager.cpp
index 04f9ffdc9..0e6319816 100644
--- a/src/gui/window-manager.cpp
+++ b/src/gui/window-manager.cpp
@@ -236,7 +236,9 @@ WindowManager::add_theme_icon_source(Gtk::IconSet &icon_set,
   // Try to load the icon
   RefPtr<Gtk::IconTheme> theme = Gtk::IconTheme::get_default();
   REQUIRE(theme);
-  const IconInfo info = theme->lookup_icon(icon_name, width,
+  
+  TODO ("find out how IconInfo could be made const. For example, GTKmm 2.10.10 is missing the const on operator bool() in iconinfo.h");
+  IconInfo info = theme->lookup_icon(icon_name, width,
     (IconLookupFlags)0);
   if(info)
     {