diff --git a/slsReceiverSoftware/include/sls_receiver_defs.h b/slsReceiverSoftware/include/sls_receiver_defs.h
index 04f647f0a..07566ab84 100755
--- a/slsReceiverSoftware/include/sls_receiver_defs.h
+++ b/slsReceiverSoftware/include/sls_receiver_defs.h
@@ -8,7 +8,9 @@
 #endif
 
 #include <stdint.h> 
+#ifdef __cplusplus
 #include <string>
+#endif
 #include "ansi.h"
 
 
@@ -112,7 +114,7 @@ public:
 		RUNNING /**< acquisition  running, no data in memory */
 	};
 
-
+#ifdef __cplusplus
 	  /** returns string from enabled/disabled
 	      \param b true or false
 	      \returns string enabled, disabled
@@ -172,6 +174,7 @@ public:
 	    default:       		return std::string("idle");		\
 	    }};
 
+#endif
 
 #ifdef __cplusplus
 protected:
diff --git a/slsReceiverSoftware/src/UDPStandardImplementation.cpp b/slsReceiverSoftware/src/UDPStandardImplementation.cpp
index fee4a16c0..2bafb96b1 100644
--- a/slsReceiverSoftware/src/UDPStandardImplementation.cpp
+++ b/slsReceiverSoftware/src/UDPStandardImplementation.cpp
@@ -43,10 +43,11 @@ UDPStandardImplementation::UDPStandardImplementation(){
 
 	//to increase socket receiver buffer size and max length of input queue by changing kernel settings
 	if(myDetectorType == EIGER);
-	else if(system("echo $((100*1024*1024)) > /proc/sys/net/core/rmem_max"))
+	else if(system("echo $((100*1024*1024)) > /proc/sys/net/core/rmem_max")){
 		FILE_LOG(logDEBUG) << "Warning: No root permission to change socket receiver buffer size in file /proc/sys/net/core/rmem_max";
-	else if(system("echo 250000 > /proc/sys/net/core/netdev_max_backlog"))
+	}else if(system("echo 250000 > /proc/sys/net/core/netdev_max_backlog")){
 		FILE_LOG(logDEBUG) << "Warning: No root permission to change max length of input queue in file /proc/sys/net/core/netdev_max_backlog";
+	}
 	/** permanent setting by heiner
 	    net.core.rmem_max = 104857600 # 100MiB
 	    net.core.netdev_max_backlog = 250000