diff --git a/slsDetectorSoftware/include/multiSlsDetector.h b/slsDetectorSoftware/include/multiSlsDetector.h
index 57af13111..9130e7497 100755
--- a/slsDetectorSoftware/include/multiSlsDetector.h
+++ b/slsDetectorSoftware/include/multiSlsDetector.h
@@ -1299,7 +1299,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
      * @param detPos -1 for all detectors in  list or specific detector position
      * @returns return value  (mostly -1 as it can't read adc register)
      */
-    int writeAdcRegister(int addr, int val, int detPos = -1);
+    int writeAdcRegister(uint32_t addr, uint32_t val, int detPos = -1);
 
     /**
      * Activates/Deactivates the detector (Eiger only)
diff --git a/slsDetectorSoftware/include/slsDetector.h b/slsDetectorSoftware/include/slsDetector.h
index 9e95e539a..31f74f2d0 100755
--- a/slsDetectorSoftware/include/slsDetector.h
+++ b/slsDetectorSoftware/include/slsDetector.h
@@ -1160,7 +1160,7 @@ class slsDetector : public virtual slsDetectorDefs{
 	 * @param val value
 	 * @returns return value  (mostly -1 as it can't read adc register)
 	 */
-    int writeAdcRegister(int addr, int val);
+    int writeAdcRegister(uint32_t addr, uint32_t val);
 
     /**
 	 * Activates/Deactivates the detector (Eiger only)
diff --git a/slsDetectorSoftware/src/multiSlsDetector.cpp b/slsDetectorSoftware/src/multiSlsDetector.cpp
index 6eb43c94a..df53fe95b 100755
--- a/slsDetectorSoftware/src/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/src/multiSlsDetector.cpp
@@ -2448,7 +2448,7 @@ const slsDetectorDefs::ROI *multiSlsDetector::getROI(int &n, int detPos) {
     return retval;
 }
 
-int multiSlsDetector::writeAdcRegister(int addr, int val, int detPos) {
+int multiSlsDetector::writeAdcRegister(uint32_t addr, uint32_t val, int detPos) {
     // single
     if (detPos >= 0) {
         return detectors[detPos]->writeAdcRegister(addr, val);
diff --git a/slsDetectorSoftware/src/slsDetector.cpp b/slsDetectorSoftware/src/slsDetector.cpp
index 6e66fc7e4..1f146b8fb 100755
--- a/slsDetectorSoftware/src/slsDetector.cpp
+++ b/slsDetectorSoftware/src/slsDetector.cpp
@@ -3204,10 +3204,10 @@ int slsDetector::sendROI(int n, ROI roiLimits[]) {
     return ret;
 }
 
-int slsDetector::writeAdcRegister(int addr, int val) {
+int slsDetector::writeAdcRegister(uint32_t addr, uint32_t val) {
     int fnum = F_WRITE_ADC_REG;
     int ret = FAIL;
-    uint32_t args[2] = {(uint32_t)addr, (uint32_t)val};
+    uint32_t args[]{addr, val};
     FILE_LOG(logDEBUG1) << "Writing to ADC register 0x" << std::hex << addr
                         << "data: 0x" << std::hex << val << std::dec;
 
@@ -3236,7 +3236,7 @@ int slsDetector::activate(int enable) {
         ret = client.sendCommandThenRead(fnum, &arg, sizeof(arg), &retval,
                                          sizeof(retval));
         FILE_LOG(logDEBUG1) << "Activate: " << retval;
-        detector_shm()->activated = retval;
+        detector_shm()->activated = static_cast<bool>(retval);
     }
     if (ret == FORCE_UPDATE) {
         ret = updateDetector();
@@ -3260,7 +3260,7 @@ int slsDetector::activate(int enable) {
             updateCachedReceiverVariables();
         }
     }
-    return detector_shm()->activated;
+    return static_cast<int>(detector_shm()->activated);
 }
 
 int slsDetector::setDeactivatedRxrPaddingMode(int padding) {