diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68e52aba6..e30c506a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -Wno-misleading-indentation")
 endif()
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -std=c++11 ")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 ")
 
 # set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=thread")
 # set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=thread")
diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index 4f9a7f91d..f8eb13484 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -2123,7 +2123,7 @@ int multiSlsDetector::setROI(int n, ROI roiLimits[], int detPos) {
         ymin = roiLimits[i].ymin;
         ymax = roiLimits[i].ymax;
 
-        if (getDetectorsType() != JUNGFRAUCTB || getNumberOfDetectors() > 1) {
+        if (getNumberOfDetectors() > 1) {
             // check roi max values
             idet = decodeNChannel(xmax, ymax, channelX, channelY);
             FILE_LOG(logDEBUG1) << "Decoded Channel max vals: " << std::endl
diff --git a/slsDetectorSoftware/slsDetector/slsDetector.h b/slsDetectorSoftware/slsDetector/slsDetector.h
index 1212b1ccd..e3d744cea 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.h
+++ b/slsDetectorSoftware/slsDetector/slsDetector.h
@@ -1569,7 +1569,7 @@ public:
 	 * @param addr wait address, -1 gets
 	 * @returns actual value
 	 */
-	uint64_t setCTBPatWaitAddr(uint64_t level, uint64_t addr=-1);
+	int setCTBPatWaitAddr(uint64_t level, uint64_t addr=-1);
 
 	/**
 	 * Sets the wait time in the CTB
diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
index eadda1810..07a23c5ae 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
@@ -1,7 +1,5 @@
 #include "slsDetectorUsers.h"
 #include "detectorData.h"
-
-#include "multiSlsDetector.h"
 #include "multiSlsDetectorClient.h"
 
 
@@ -235,11 +233,11 @@ int slsDetectorUsers::setFlowControl10G(int i, int detPos) {
 }
 
 int slsDetectorUsers::setROI(int n, slsDetectorDefs::ROI roiLimits[], int detPos) {
-    return myDetector->setROI(n, roiLimits, detPos);
+    return detector.setROI(n, roiLimits, detPos);
 }
 
 slsDetectorDefs::ROI* slsDetectorUsers::getROI(int &n, int detPos) {
-    return myDetector->getROI(n, detPos);
+    return detector.getROI(n, detPos);
 }
 
 /************************************************************************
diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUsers.h b/slsDetectorSoftware/slsDetector/slsDetectorUsers.h
index 808fc15de..883d3b17f 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorUsers.h
+++ b/slsDetectorSoftware/slsDetector/slsDetectorUsers.h
@@ -14,7 +14,7 @@
 
 
 class detectorData;
-class multiSlsDetector;
+#include "multiSlsDetector.h"
 
 #include <cstdint>
 #include <string>
diff --git a/slsReceiverSoftware/src/Listener.cpp b/slsReceiverSoftware/src/Listener.cpp
index 00bc25bd2..67c3bcb03 100644
--- a/slsReceiverSoftware/src/Listener.cpp
+++ b/slsReceiverSoftware/src/Listener.cpp
@@ -572,9 +572,9 @@ uint32_t Listener::ListenToAnImage(char* buf) {
 			RecordFirstIndices(fnum);
 
         if (pnum >= pperFrame ) {
-            FILE_LOG(logERROR, ("Bad packet %d (fnum:%lld), throwing away. "
-                    "Packets caught so far: %d\n",
-                    pnum, (long long int)fnum, numpackets));
+            FILE_LOG(logERROR) << "Bad packet " << pnum <<
+                    "(fnum: " << fnum << "), throwing away. "
+                    "Packets caught so far: " << numpackets;
           return 0;   // bad packet
         }