diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
index b79e7dd89..2703b0156 100755
Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ
diff --git a/slsDetectorServers/slsDetectorServer/LTC2620.h b/slsDetectorServers/slsDetectorServer/LTC2620.h
index f2b0bff9b..3064e8be6 100755
--- a/slsDetectorServers/slsDetectorServer/LTC2620.h
+++ b/slsDetectorServers/slsDetectorServer/LTC2620.h
@@ -302,9 +302,7 @@ int LTC2620_SetDACValue (int dacnum, int val, int mV, int* dacval) {
 
     // set
     if ( (*dacval >= 0) || (*dacval == LTC2620_PWR_DOWN_VAL)) {
-#ifndef CHIPTESTBOARDD
         FILE_LOG(logINFO, ("Setting DAC %d: %d dac (%d mV)\n",dacnum, *dacval, dacmV));
-#endif
         LTC2620_SetDAC(dacnum, *dacval);
     }
     return OK;
diff --git a/slsDetectorSoftware/src/slsDetectorCommand.cpp b/slsDetectorSoftware/src/slsDetectorCommand.cpp
index e9ad54992..493e3e646 100755
--- a/slsDetectorSoftware/src/slsDetectorCommand.cpp
+++ b/slsDetectorSoftware/src/slsDetectorCommand.cpp
@@ -3878,13 +3878,16 @@ std::string slsDetectorCommand::cmdDAC(int narg, const char * const args[], int
     int val = -1;
     char answer[1000];
     int mode = 0;
+    int iarg = 1;
 
     if (cmd == "dac") {
         int idac = -1;
-        if (sscanf(args[1], "%d", &idac) != 1) {
-            return std::string("Could not scan dac index") + std::string(args[1]);
+        if (sscanf(args[iarg], "%d", &idac) != 1) {
+            return std::string("Could not scan dac index") + std::string(args[iarg]);
         }
         dac = (dacIndex)idac;
+        ++iarg;
+        --narg;
     }
     else if (cmd == "adcvpp")
         dac = ADC_VPP;
@@ -4017,22 +4020,22 @@ std::string slsDetectorCommand::cmdDAC(int narg, const char * const args[], int
 
     if (action == PUT_ACTION) {
 
-        if (narg >= 3)
-            if (!strcasecmp(args[2], "mv"))
-                mode = 1;
-
-        if (sscanf(args[1], "%d", &val))
+        if (sscanf(args[iarg], "%d", &val)) 
             ;
         else
-            return std::string("cannot scan DAC value ") + std::string(args[1]);
+            return std::string("cannot scan DAC value ") + std::string(args[iarg]);
+        ++iarg;
+
+        if ((narg >= 3) && (!strcasecmp(args[iarg], "mv")))
+                mode = 1;
 
         myDet->setDAC(val, dac, mode, detPos);
     }
+   
     // get (dacs in dac units or mV)
-    else if ((narg >= 2) && (!strcasecmp(args[1], "mv"))) {
+    else if ((narg >= 2) && (!strcasecmp(args[iarg], "mv"))) {
              mode = 1;
     }
-
     sprintf(answer, "%d", myDet->setDAC(-1, dac, mode, detPos));
     if (mode)
         strcat(answer, " mV");
diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h
index 020792a21..51a9c4e37 100644
--- a/slsSupportLib/include/versionAPI.h
+++ b/slsSupportLib/include/versionAPI.h
@@ -5,6 +5,6 @@
 #define APIRECEIVER 0x190405
 #define APIGUI 0x190405
 #define APIGOTTHARD 0x190604
-#define APICTB 0x190604
 #define APIJUNGFRAU 0x190604
 #define APIEIGER 0x190604
+#define APICTB 0x190604