diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.1.0.16.0 b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.1.0.16.1
similarity index 70%
rename from slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.1.0.16.0
rename to slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.1.0.16.1
index 32e5e515f..e42624291 100755
Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.1.0.16.0 and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.1.0.16.1 differ
diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
index d047cac0f..651eecb39 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: 12e4530702b836985408bc1e85ddb0d996a0153b 
-Revision: 314 
+Repsitory UUID: 8b02aa9e91bbee0470492dcf1ff67415851e14fa 
+Revision: 315 
 Branch: 3.1.0-rc 
-Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 3445 
-Last Changed Date: 2018-02-23 13:07:05.000000002 +0100 ./Makefile.virtual
+Last Changed Author: Erik_Frojdh 
+Last Changed Rev: 3455 
+Last Changed Date: 2018-03-08 16:44:32.000000002 +0100 ./FebRegisterDefs.h
diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
index 1a7c626de..857ca4ad2 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 "12e4530702b836985408bc1e85ddb0d996a0153b"
-#define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x3445
-#define GITDATE 0x20180223
+#define GITREPUUID "8b02aa9e91bbee0470492dcf1ff67415851e14fa"
+#define GITAUTH "Erik_Frojdh"
+#define GITREV 0x3455
+#define GITDATE 0x20180308
 #define GITBRANCH "3.1.0-rc"
diff --git a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.0.1 b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.0.2
similarity index 99%
rename from slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.0.1
rename to slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.0.2
index 6dea7da70..99ac8fd9c 100755
Binary files a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.0.1 and b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.0.2 differ
diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
index 6c9f772b2..f3aa14041 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: 0b017b886c879792b644cf8ec1e1562a520a1205 
-Revision: 113 
-Branch: 3.0.1 
-Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 3434 
-Last Changed Date: 2018-02-26 13:52:20.000000002 +0100 ./RegisterDefs.h
+Repsitory UUID: 8b02aa9e91bbee0470492dcf1ff67415851e14fa 
+Revision: 117 
+Branch: 3.1.0-rc 
+Last Changed Author: Erik_Frojdh 
+Last Changed Rev: 3455 
+Last Changed Date: 2018-03-08 16:44:32.000000002 +0100 ./RegisterDefs.h
diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
index adb58a39a..857ca4ad2 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 "0b017b886c879792b644cf8ec1e1562a520a1205"
-#define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x3434
-#define GITDATE 0x20180226
-#define GITBRANCH "3.0.1"
+#define GITREPUUID "8b02aa9e91bbee0470492dcf1ff67415851e14fa"
+#define GITAUTH "Erik_Frojdh"
+#define GITREV 0x3455
+#define GITDATE 0x20180308
+#define GITBRANCH "3.1.0-rc"
diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
index 7e5c3243d..8b6281825 100755
--- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
+++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
@@ -1253,7 +1253,7 @@ int get_adc(int file_des) {
 int write_register(int file_des) {
 	int ret=OK,ret1=OK;
 	int n=0;
-	int retval=-1;
+	uint32_t retval=-1;
 	sprintf(mess,"write to register failed\n");
 
 	// receive arguments
@@ -1261,7 +1261,7 @@ int write_register(int file_des) {
 	n = receiveData(file_des,arg,sizeof(arg),INT32);
 	if (n < 0) return printSocketReadError();
 	int addr=arg[0];
-	int val=arg[1];
+	uint32_t val=arg[1];
 
 	// execute action
 	if (differentClients && lockStatus) {
@@ -1311,7 +1311,7 @@ int write_register(int file_des) {
 int read_register(int file_des) {
 	int ret=OK,ret1=OK;
 	int n=0;
-	int retval=-1;
+	uint32_t retval=-1;
 	sprintf(mess,"read register failed\n");
 
 	// receive arguments