diff --git a/slsDetectorServers/gotthardDetectorServer/gitInfo.txt b/slsDetectorServers/gotthardDetectorServer/gitInfo.txt
index e2fd82f88..dba3ce1e6 100644
--- a/slsDetectorServers/gotthardDetectorServer/gitInfo.txt
+++ b/slsDetectorServers/gotthardDetectorServer/gitInfo.txt
@@ -1,9 +1,9 @@
 Path: slsDetectorPackage/slsDetectorServers/gotthardDetectorServer 
 URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
 Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
-Repsitory UUID: 32924def331e065c3955c593c07ceef2955e89e6 
-Revision: 1 
+Repsitory UUID: 91dd176a0fb314f583ca6e29140053f1eb742896 
+Revision: 5 
 Branch: refactor 
 Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 4104 
-Last Changed Date: 2018-10-11 13:46:09.000000002 +0200 ./server_funcs.h
+Last Changed Rev: 4166 
+Last Changed Date: 2018-11-08 17:15:25.000000002 +0100 ./RegisterDefs.h
diff --git a/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h b/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h
index 621db547e..07e4aa9c6 100644
--- a/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h
+++ b/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h
@@ -1,6 +1,6 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "32924def331e065c3955c593c07ceef2955e89e6"
+#define GITREPUUID "91dd176a0fb314f583ca6e29140053f1eb742896"
 #define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x4104
-#define GITDATE 0x20181011
+#define GITREV 0x4166
+#define GITDATE 0x20181108
 #define GITBRANCH "refactor"
diff --git a/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h b/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h
index 24413ba7d..37aac6a40 100644
--- a/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h
+++ b/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h
@@ -1,5 +1,4 @@
-#ifndef REGISTER_DEFS_H
-#define REGISTER_DEFS_H
+#pragma once
 
 /* Definitions for FPGA*/
 #define MEM_MAP_SHIFT 1
@@ -398,8 +397,6 @@
 #define ASIC_CTRL_DS_TMR_VAL            ((0x1F << ASIC_CTRL_DS_TMR_OFST) & ASIC_CTRL_DS_TMR_MSK)
 
 
-#endif  //REGISTERS_G_H
-
 
 
 
diff --git a/slsDetectorServers/jungfrauDetectorServer/gitInfo.txt b/slsDetectorServers/jungfrauDetectorServer/gitInfo.txt
index 116c0f37e..d5eb8a88a 100644
--- a/slsDetectorServers/jungfrauDetectorServer/gitInfo.txt
+++ b/slsDetectorServers/jungfrauDetectorServer/gitInfo.txt
@@ -1,9 +1,9 @@
 Path: slsDetectorPackage/slsDetectorServers/jungfrauDetectorServer 
 URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
 Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
-Repsitory UUID: 92123069ce045314a12416a7e8b308875d7f9f21 
-Revision: 7 
+Repsitory UUID: 91dd176a0fb314f583ca6e29140053f1eb742896 
+Revision: 11 
 Branch: refactor 
 Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 4158 
-Last Changed Date: 2018-11-02 12:00:46.000000002 +0100 ./Makefile
+Last Changed Rev: 4166 
+Last Changed Date: 2018-11-08 17:17:22.000000002 +0100 ./RegisterDefs.h
diff --git a/slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrau.h b/slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrau.h
index 90af7896d..07e4aa9c6 100644
--- a/slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrau.h
+++ b/slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrau.h
@@ -1,6 +1,6 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "92123069ce045314a12416a7e8b308875d7f9f21"
+#define GITREPUUID "91dd176a0fb314f583ca6e29140053f1eb742896"
 #define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x4158
-#define GITDATE 0x20181102
+#define GITREV 0x4166
+#define GITDATE 0x20181108
 #define GITBRANCH "refactor"
diff --git a/slsDetectorServers/slsDetectorServer/slsDetectorServer.c b/slsDetectorServers/slsDetectorServer/slsDetectorServer.c
index 365c35069..a13fe1c0a 100755
--- a/slsDetectorServers/slsDetectorServer/slsDetectorServer.c
+++ b/slsDetectorServers/slsDetectorServer/slsDetectorServer.c
@@ -48,7 +48,7 @@ int main(int argc, char *argv[]){
 			}
             else if(!strcasecmp(argv[i],"-devel")){
                 FILE_LOG(logINFO, ("Detected developer mode\n"));
-                debugflag = DEVELOPER_MODE;
+                debugflag = 1;
             }
 #ifdef GOTTHARDD
 			else if(!strcasecmp(argv[i],"-phaseshift")){
diff --git a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
index 8e91f935d..b68ebc967 100755
--- a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
+++ b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
@@ -38,7 +38,6 @@ int (*flist[NUM_DET_FUNCTIONS])(int);
 uint32_t dhcpipad = 0;
 #endif
 
-enum numberMode {DEC, HEX};
 enum updateRet {NO_UPDATE, UPDATE};
 
 /* initialization functions */
@@ -1924,7 +1923,8 @@ int load_image(int file_des) {
 
 	enum imageType index = args[0];
 	int numChannels = args[1];
-	short int imageVals[numChannels] = {0};
+	short int imageVals[numChannels];
+	memset(imageVals, 0, numChannels * sizeof(short int));
 	if (numChannels > 0) {
 		if (receiveData(file_des, imageVals, numChannels * sizeof(short int), OTHER) < 0) {
 			return printSocketReadError();
@@ -1975,7 +1975,8 @@ int read_counter_block(int file_des) {
 		return printSocketReadError();
 	int startACQ = args[0];
     int numChannels = args[1];
-    short int retval[numChannels] = {0};
+    short int retval[numChannels];
+    memset(retval, 0, numChannels * sizeof(short int));
 	FILE_LOG(logDEBUG1, ("Read counter block with start acq bit: %d\n", startACQ));
 
 #ifndef GOTTHARDD
diff --git a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h
index 9fcbc99e0..580e86c19 100755
--- a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h
+++ b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h
@@ -1,6 +1,8 @@
 #pragma once
 #include "sls_detector_defs.h"
 
+enum numberMode {DEC, HEX};
+
 // initialization functions
 int printSocketReadError();
 void init_detector();
@@ -9,8 +11,8 @@ const char* getFunctionName(enum detFuncs func);
 void function_table();
 void functionNotImplemented();
 void modeNotImplemented(char* modename, int mode);
-void validate(int arg, int retval, char* modename, int hex);
-void validate64(int64_t arg, int64_t retval, char* modename, int hex);
+void validate(int arg, int retval, char* modename, enum numberMode nummode);
+void validate64(int64_t arg, int64_t retval, char* modename, enum numberMode nummode);
 int M_nofunc(int);
 int M_nofuncMode(int);