6 files changed, 10 insertions, 6 deletions
diff --git a/gr-blocks/include/gnuradio/blocks/head.h b/gr-blocks/include/gnuradio/blocks/head.h
index 24772a43fa..a41137c023 100644
--- a/gr-blocks/include/gnuradio/blocks/head.h
+++ b/gr-blocks/include/gnuradio/blocks/head.h
@@ -47,7 +47,7 @@ namespace gr {
                        uint64_t nitems);
 
       virtual void reset() = 0;
-      virtual void set_length(int nitems) = 0;
+      virtual void set_length(uint64_t nitems) = 0;
     };
 
   } /* namespace blocks */
diff --git a/gr-blocks/lib/head_impl.h b/gr-blocks/lib/head_impl.h
index fe2918c404..4a2c33864b 100644
--- a/gr-blocks/lib/head_impl.h
+++ b/gr-blocks/lib/head_impl.h
@@ -39,7 +39,7 @@ namespace gr {
       ~head_impl();
 
       void reset() { d_ncopied_items = 0; }
-      void set_length(int nitems) { d_nitems = nitems; }
+      void set_length(uint64_t nitems) { d_nitems = nitems; }
 
       int work(int noutput_items,
                gr_vector_const_void_star &input_items,
diff --git a/gr-digital/lib/correlate_access_code_bb_ts_impl.cc b/gr-digital/lib/correlate_access_code_bb_ts_impl.cc
index c04bf4e180..e2fe37d8bb 100644
--- a/gr-digital/lib/correlate_access_code_bb_ts_impl.cc
+++ b/gr-digital/lib/correlate_access_code_bb_ts_impl.cc
@@ -84,8 +84,8 @@ namespace gr {
       if(d_len > 64)
         return false;
 
-      // set len top bits to 1.
-      d_mask = ((~0ULL) >> (64 - d_len)) << (64 - d_len);
+      // set len least significant bits to 1.
+      d_mask = ((~0ULL) >> (64 - d_len));
 
       d_access_code = 0;
       for(unsigned i=0; i < d_len; i++){
diff --git a/gr-digital/lib/correlate_access_code_ff_ts_impl.cc b/gr-digital/lib/correlate_access_code_ff_ts_impl.cc
index 86bbb686d5..dfbac40505 100644
--- a/gr-digital/lib/correlate_access_code_ff_ts_impl.cc
+++ b/gr-digital/lib/correlate_access_code_ff_ts_impl.cc
@@ -84,8 +84,8 @@ namespace gr {
       if(d_len > 64)
         return false;
 
-      // set len top bits to 1.
-      d_mask = ((~0ULL) >> (64 - d_len)) << (64 - d_len);
+      // set len least significant bits to 1.
+      d_mask = ((~0ULL) >> (64 - d_len));
 
       d_access_code = 0;
       for(unsigned i=0; i < d_len; i++){
diff --git a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt
index 0513f44086..9b41b99f14 100644
--- a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt
+++ b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt
@@ -112,6 +112,7 @@ find_package(Doxygen)
 # API compatible version required.
 set(GR_REQUIRED_COMPONENTS RUNTIME)
 find_package(Gnuradio "3.7.2" REQUIRED)
+list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
 
 if(NOT CPPUNIT_FOUND)
     message(FATAL_ERROR "CppUnit required to compile howto")
diff --git a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrMiscUtils.cmake b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrMiscUtils.cmake
index 188c40480b..5bad57c51e 100644
--- a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrMiscUtils.cmake
+++ b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrMiscUtils.cmake
@@ -363,6 +363,7 @@ macro(GR_EXPAND_X_H component root)
 
 import sys, os, re
 sys.path.append('${GR_RUNTIME_PYTHONPATH}')
+sys.path.append('${CMAKE_SOURCE_DIR}/python')
 os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
 os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
 
@@ -406,6 +407,7 @@ macro(GR_EXPAND_X_CC_H component root)
 
 import sys, os, re
 sys.path.append('${GR_RUNTIME_PYTHONPATH}')
+sys.path.append('${CMAKE_SOURCE_DIR}/python')
 os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
 os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
 
@@ -466,6 +468,7 @@ macro(GR_EXPAND_X_CC_H_IMPL component root)
 
 import sys, os, re
 sys.path.append('${GR_RUNTIME_PYTHONPATH}')
+sys.path.append('${CMAKE_SOURCE_DIR}/python')
 os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
 os.chdir('${CMAKE_CURRENT_BINARY_DIR}')