diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f5ecff9cc46b345ef3b6aa5e315eabaa5352ed66..fabccf86fe978b115ee58c49e821b7fe0f18eb2b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,11 +1,16 @@
 add_subdirectory(libRender)
+
 if (WITH_H3D_SUPPORT)
     add_subdirectory(libH3D)
 endif (WITH_H3D_SUPPORT)
+
 add_subdirectory(Plugin)
+
 set(MARA_IN_BUILD_TREE True)
 #add_subdirectory(Mara EXCLUDE_FROM_ALL)
+add_subdirectory(Mara)
+
 set(VIEWER_IN_BUILD_TREE True)
 add_subdirectory(DemoApp EXCLUDE_FROM_ALL)
 
-add_subdirectory(Mara)
+
diff --git a/src/libH3D/CMakeLists.txt b/src/libH3D/CMakeLists.txt
index 4fa15dd96aef2096e336565c987826e64fff8b97..776980ed763270bd6234fdaf64762cbcdb43f187 100644
--- a/src/libH3D/CMakeLists.txt
+++ b/src/libH3D/CMakeLists.txt
@@ -88,6 +88,5 @@ configure_radium_library(
 #        TARGET ${PROJECT_NAME}
 #        PREFIX ${PROJECT_NAME}
 #        DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Shaders
-#        BUILD_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/Resources/${PROJECT_NAME}
 #)
 
diff --git a/src/libRender/CMakeLists.txt b/src/libRender/CMakeLists.txt
index 4bb346a7635bd11673f199c454b3aa1612fad7ad..4c2adc97fcd7e37e5ea6dbecc37c8d4884f874a2 100644
--- a/src/libRender/CMakeLists.txt
+++ b/src/libRender/CMakeLists.txt
@@ -113,11 +113,10 @@ configure_radium_library(
     PACKAGE_DIR ${CMAKE_INSTALL_PREFIX}/lib/cmake
 )
 
-installTargetResources(
+install_target_resources(
     TARGET ${libName}
-    PREFIX ${PROJECT_NAME}
-    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/RadiumNBR/Shaders
-    BUILD_LOCATION ${CMAKE_CURRENT_BINARY_DIR}//Resources/${PROJECT_NAME}
+    RESOURCES_INSTALL_DIR ${PROJECT_NAME}
+    RESOURCES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/RadiumNBR/Shaders
 )
 
 #-----------------------------------------------------------------------------------
diff --git a/src/libRender/RadiumNBR/NodeBasedRenderer.cpp b/src/libRender/RadiumNBR/NodeBasedRenderer.cpp
index e09328cd9f63ca3f09ee9d757fbc3a9e87faa682..7d528e575d58e19d7f5212da007fbd70905a4e30 100644
--- a/src/libRender/RadiumNBR/NodeBasedRenderer.cpp
+++ b/src/libRender/RadiumNBR/NodeBasedRenderer.cpp
@@ -121,8 +121,6 @@ void NodeBasedRenderer::initializeInternal() {
         LOG( Ra::Core::Utils::logERROR ) << "Unable to find resources for NodeBasedRenderer!";
         return;
     }
-    else
-    { LOG( Ra::Core::Utils::logINFO ) << "NodeBasedRenderer Resources are at " << *resourcesCheck; }
     auto resourcesPath{*resourcesCheck};
 
     // TODO, do we really need to setup an index for the two following passes
diff --git a/src/libRender/RadiumNBR/Renderer/Visualization.cpp b/src/libRender/RadiumNBR/Renderer/Visualization.cpp
index 333d32d41c247147aec6e6bd88f71c1b6b4fc29b..561df95a790ce23b755734229ad106c147be7f5c 100644
--- a/src/libRender/RadiumNBR/Renderer/Visualization.cpp
+++ b/src/libRender/RadiumNBR/Renderer/Visualization.cpp
@@ -22,8 +22,6 @@ void VisualizationController::configure( RadiumNBR::NodeBasedRenderer* renderer,
         LOG( Ra::Core::Utils::logERROR ) << "Unable to find resources for NodeBasedRenderer!";
         return;
     }
-    else
-    { LOG( Ra::Core::Utils::logINFO ) << "NodeBasedRenderer Resources are at " << *resourcesCheck; }
     auto resourcesPath{*resourcesCheck};
     auto shaderManager = Ra::Engine::RadiumEngine::getInstance()->getShaderProgramManager();
     auto colortexture  = renderer->sharedTextures().find( "Linear RGB (RadiumNBR)" );