diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14f4ecf85..116d270cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ option (USE_TEXTCLIENT "Text Client" OFF)
 option (USE_RECEIVER "Receiver" OFF)
 option (USE_GUI "GUI" OFF)
 
-set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -Wall -Wno-misleading-indentation")
+set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -std=c++98 -Wall -Wno-misleading-indentation")
 
 find_package(Qt4)
 find_package(Qwt 6)
diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer
index e95c3395d..c2c348a0a 100755
Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer differ
diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
index f8ff0bed0..37168cb6b 100644
--- a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
+++ b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer 
 URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
 Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
-Repsitory UUID: 98752e1cdbd78167ad20c6a01a17852b1a2263a7 
-Revision: 326 
+Repsitory UUID: da010a03d725b6f18020d2142d58771534414274 
+Revision: 328 
 Branch: developer 
-Last Changed Author: Gemma_Tinti 
-Last Changed Rev: 3733 
-Last Changed Date: 2018-03-21 08:34:29.000000002 +0100 ./FebRegisterDefs.h
+Last Changed Author: Erik_Frojdh 
+Last Changed Rev: 3751 
+Last Changed Date: 2018-04-03 16:29:39.000000002 +0200 ./xparameters.h
diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
index 6f11e61ce..37d82e952 100644
--- a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
+++ b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
@@ -1,6 +1,6 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "98752e1cdbd78167ad20c6a01a17852b1a2263a7"
-#define GITAUTH "Gemma_Tinti"
-#define GITREV 0x3733
-#define GITDATE 0x20180321
+#define GITREPUUID "da010a03d725b6f18020d2142d58771534414274"
+#define GITAUTH "Erik_Frojdh"
+#define GITREV 0x3751
+#define GITDATE 0x20180403
 #define GITBRANCH "developer"
diff --git a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
index aaaa788e6..995b38685 100755
Binary files a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ
diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
index d4c24f7db..889923a98 100644
--- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
+++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer 
 URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
 Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
-Repsitory UUID: 98752e1cdbd78167ad20c6a01a17852b1a2263a7 
-Revision: 133 
+Repsitory UUID: da010a03d725b6f18020d2142d58771534414274 
+Revision: 135 
 Branch: developer 
-Last Changed Author: Gemma_Tinti 
-Last Changed Rev: 3733 
-Last Changed Date: 2018-03-21 08:34:29.000000002 +0100 ./RegisterDefs.h
+Last Changed Author: Erik_Frojdh 
+Last Changed Rev: 3751 
+Last Changed Date: 2018-04-03 16:29:40.000000002 +0200 ./RegisterDefs.h
diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
index 6f11e61ce..37d82e952 100644
--- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
+++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
@@ -1,6 +1,6 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "98752e1cdbd78167ad20c6a01a17852b1a2263a7"
-#define GITAUTH "Gemma_Tinti"
-#define GITREV 0x3733
-#define GITDATE 0x20180321
+#define GITREPUUID "da010a03d725b6f18020d2142d58771534414274"
+#define GITAUTH "Erik_Frojdh"
+#define GITREV 0x3751
+#define GITDATE 0x20180403
 #define GITBRANCH "developer"
diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
index 1e58550c5..fab206e9b 100755
--- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
+++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
@@ -653,7 +653,7 @@ int get_id(int file_des) {
 	n = receiveData(file_des,&arg,sizeof(arg),INT32);
 	if (n < 0) return printSocketReadError();
 
-	if (arg == MODULE_FIRMWARE_VERSION) {
+	if (arg == MODULE_SERIAL_NUMBER) {
 		n = receiveData(file_des,&imod,sizeof(imod),INT32);
 		if (n < 0) return printSocketReadError();
 	}