diff --git a/wsjtx/CMakeLists.txt b/wsjtx/CMakeLists.txt
index e81dc64..e0ccd51 100644
--- a/wsjtx/CMakeLists.txt
+++ b/wsjtx/CMakeLists.txt
@@ -838,11 +838,11 @@ find_program(ETAGS etags)
 #
 # Boost
 #
-set (Boost_NO_SYSTEM_PATHS TRUE)
+set (Boost_NO_SYSTEM_PATHS TRUE CACHE BOOL "")
 if (Boost_NO_SYSTEM_PATHS)
   set (BOOST_ROOT ${PROJECT_SOURCE_DIR}/boost)
 endif ()
-find_package (Boost 1.63 REQUIRED)
+find_package (Boost 1.60 REQUIRED)
 if (Boost_FOUND)
   include_directories (${Boost_INCLUDE_DIRS})
 endif ()
@@ -860,7 +860,7 @@ find_package (FFTW3 COMPONENTS double single threads REQUIRED)
 #
 # libhamlib setup
 #
-set (hamlib_STATIC 1)
+set (hamlib_STATIC 1 CACHE BOOL "")
 find_package (hamlib 3 REQUIRED)
 find_program (RIGCTL_EXE rigctl)
 find_program (RIGCTLD_EXE rigctld)
@@ -1430,20 +1430,6 @@ install (TARGETS jt9 ft8code jt65code qra64code qra64sim jt9code jt4code
   BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
   )
 
-install (PROGRAMS
-  ${RIGCTL_EXE}
-  DESTINATION ${CMAKE_INSTALL_BINDIR}
-  #COMPONENT runtime
-  RENAME rigctl-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
-  )
-
-install (PROGRAMS
-  ${RIGCTLD_EXE}
-  DESTINATION ${CMAKE_INSTALL_BINDIR}
-  #COMPONENT runtime
-  RENAME rigctld-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
-  )
-
 install (FILES
   README
   COPYING
diff --git a/wsjtx/HamlibTransceiver.hpp b/wsjtx/HamlibTransceiver.hpp
index c8c0f74..0136b98 100644
--- a/wsjtx/HamlibTransceiver.hpp
+++ b/wsjtx/HamlibTransceiver.hpp
@@ -10,6 +10,10 @@
 #include "TransceiverFactory.hpp"
 #include "PollingTransceiver.hpp"
 
+#ifndef RIG_PASSBAND_NOCHANGE
+#define RIG_PASSBAND_NOCHANGE RIG_PASSBAND_NORMAL
+#endif
+
 extern "C"
 {
   typedef struct rig RIG;