diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2eab382..e2fd0ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,19 +81,12 @@ if(NOT CMAKE_MODULES_DIR)
   set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake)
 endif(NOT CMAKE_MODULES_DIR)
 
-set(GR_RUNTIME_DIR      bin)
-set(GR_LIBRARY_DIR      lib${LIB_SUFFIX})
 set(GR_INCLUDE_DIR      include/foo)
-SET(GR_CMAKE_DIR        ${CMAKE_MODULES_DIR}/foo)
-set(GR_DATA_DIR         share)
+set(GR_CMAKE_DIR        ${CMAKE_MODULES_DIR}/foo)
 set(GR_PKG_DATA_DIR     ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME})
-set(GR_DOC_DIR          ${GR_DATA_DIR}/doc)
 set(GR_PKG_DOC_DIR      ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME})
-set(GR_CONF_DIR         etc)
 set(GR_PKG_CONF_DIR     ${GR_CONF_DIR}/${CMAKE_PROJECT_NAME}/conf.d)
-set(GR_LIBEXEC_DIR      libexec)
 set(GR_PKG_LIBEXEC_DIR  ${GR_LIBEXEC_DIR}/${CMAKE_PROJECT_NAME})
-set(GRC_BLOCKS_DIR      ${GR_PKG_DATA_DIR}/grc/blocks)
 
 ########################################################################
 # On Apple only, set install name and use rpath correctly, if not already set
diff --git a/lib/periodic_msg_source_impl.cc b/lib/periodic_msg_source_impl.cc
index 98e58ed..8dbd9dd 100644
--- a/lib/periodic_msg_source_impl.cc
+++ b/lib/periodic_msg_source_impl.cc
@@ -43,7 +43,7 @@ periodic_msg_source_impl::periodic_msg_source_impl(pmt::pmt_t msg,
 }
 
 periodic_msg_source_impl::~periodic_msg_source_impl() {
-	gr::thread::scoped_lock(d_mutex);
+	gr::thread::scoped_lock d_mutex;
 
 	d_finished = true;
 	d_thread->interrupt();
@@ -60,7 +60,7 @@ periodic_msg_source_impl::run(periodic_msg_source_impl *instance) {
 	while(1) {
 		long delay;
 		{
-			gr::thread::scoped_lock(d_mutex);
+			gr::thread::scoped_lock d_mutex;
 			if(d_finished || !d_nmsg_left) {
 				d_finished = true;
 				if(d_quit) {
@@ -86,32 +86,32 @@ periodic_msg_source_impl::run(periodic_msg_source_impl *instance) {
 
 void
 periodic_msg_source_impl::set_nmsg(int nmsg) {
-	gr::thread::scoped_lock(d_mutex);
+	gr::thread::scoped_lock d_mutex;
 	d_nmsg_total = nmsg;
 }
 
 int
 periodic_msg_source_impl::get_nmsg() {
-	gr::thread::scoped_lock(d_mutex);
+	gr::thread::scoped_lock d_mutex;
 	return d_nmsg_total;
 }
 
 void
 periodic_msg_source_impl::set_delay(long delay) {
-	gr::thread::scoped_lock(d_mutex);
+	gr::thread::scoped_lock d_mutex;
 	d_interval = delay;
 }
 
 long
 periodic_msg_source_impl::get_delay() {
-	gr::thread::scoped_lock(d_mutex);
+	gr::thread::scoped_lock d_mutex;
 	return d_interval;
 }
 
 
 void
 periodic_msg_source_impl::start_tx() {
-	gr::thread::scoped_lock(d_mutex);
+	gr::thread::scoped_lock d_mutex;
 
 	if(is_running()) return;
 
diff --git a/lib/random_periodic_msg_source_impl.cc b/lib/random_periodic_msg_source_impl.cc
index 735024e..1bf370d 100644
--- a/lib/random_periodic_msg_source_impl.cc
+++ b/lib/random_periodic_msg_source_impl.cc
@@ -49,7 +49,7 @@ random_periodic_msg_source_impl::random_periodic_msg_source_impl(int msg_len,
 }
 
 random_periodic_msg_source_impl::~random_periodic_msg_source_impl() {
-	gr::thread::scoped_lock(d_mutex);
+	gr::thread::scoped_lock d_mutex;
 	d_finished = true;
 	d_thread->interrupt();
 	d_thread->join();
@@ -65,7 +65,7 @@ random_periodic_msg_source_impl::run(random_periodic_msg_source_impl *instance)
 	while(1) {
 		long delay;
 		{
-			gr::thread::scoped_lock(d_mutex);
+			gr::thread::scoped_lock d_mutex;
 			if(d_finished || !d_nmsg_left) {
 				d_finished = true;
 				if(d_quit) {
@@ -104,32 +104,32 @@ random_periodic_msg_source_impl::generate_msg() {
 }
 void
 random_periodic_msg_source_impl::set_nmsg(int nmsg) {
-	gr::thread::scoped_lock(d_mutex);
+	gr::thread::scoped_lock d_mutex;
 	d_nmsg_total = nmsg;
 }
 
 int
 random_periodic_msg_source_impl::get_nmsg() {
-	gr::thread::scoped_lock(d_mutex);
+	gr::thread::scoped_lock d_mutex;
 	return d_nmsg_total;
 }
 
 void
 random_periodic_msg_source_impl::set_delay(long delay) {
-	gr::thread::scoped_lock(d_mutex);
+	gr::thread::scoped_lock d_mutex;
 	d_interval = delay;
 }
 
 long
 random_periodic_msg_source_impl::get_delay() {
-	gr::thread::scoped_lock(d_mutex);
+	gr::thread::scoped_lock d_mutex;
 	return d_interval;
 }
 
 
 void
 random_periodic_msg_source_impl::start_tx() {
-	gr::thread::scoped_lock(d_mutex);
+	gr::thread::scoped_lock d_mutex;
 
 	if(is_running()) return;
 
diff --git a/lib/rtt_measure_impl.cc b/lib/rtt_measure_impl.cc
index 9900407..0fd1804 100644
--- a/lib/rtt_measure_impl.cc
+++ b/lib/rtt_measure_impl.cc
@@ -83,7 +83,7 @@ rtt_measure_impl::general_work(int noutput, gr_vector_int& ninput_items,
 boost::posix_time::ptime
 rtt_measure_impl::start_time()
 {
-	gr::thread::scoped_lock(d_mutex);
+	gr::thread::scoped_lock d_mutex;
 	return d_start_time;
 }
 
@@ -91,4 +91,4 @@ rtt_measure::sptr
 rtt_measure::make(unsigned long interval)
 {
 	return gnuradio::get_initial_sptr(new rtt_measure_impl(interval));
-}
\ No newline at end of file
+}