diff --git a/slsReceiverSoftware/include/genericSocket.h b/slsReceiverSoftware/include/genericSocket.h
index 5ab3d07b5..5d2a0454a 100644
--- a/slsReceiverSoftware/include/genericSocket.h
+++ b/slsReceiverSoftware/include/genericSocket.h
@@ -103,7 +103,7 @@ enum communicationProtocol{
 	 struct addrinfo *result;
 	 if (!ConvertHostnameToInternetAddress(host_ip_or_name, &result)) {
 		 serverAddress.sin_family = result->ai_family;
-		 memcpy((char *) &serverAddress.sin_addr.s_addr, &((struct sockaddr_in *) result->ai_addr)->sin_addr, result->ai_addrlen);
+		 memcpy((char *) &serverAddress.sin_addr.s_addr, &((struct sockaddr_in *) result->ai_addr)->sin_addr, sizeof(in_addr_t));
 		 freeaddrinfo(result);
 		 serverAddress.sin_port = htons(port_number);
 		 socketDescriptor=0;
diff --git a/slsReceiverSoftware/src/BinaryFile.cpp b/slsReceiverSoftware/src/BinaryFile.cpp
index 1b211b1ba..5d459ac10 100644
--- a/slsReceiverSoftware/src/BinaryFile.cpp
+++ b/slsReceiverSoftware/src/BinaryFile.cpp
@@ -55,8 +55,9 @@ int BinaryFile::CreateFile(uint64_t fnum) {
 	if (BinaryFileStatic::CreateDataFile(filefd, *overWriteEnable, currentFileName, FILE_BUFFER_SIZE) == FAIL)
 		return FAIL;
 
-	if(!silentMode)
+	if(!silentMode) {
 		FILE_LOG(logINFO) << "[" << *udpPortNumber << "]: Binary File created: " << currentFileName;
+	}
 	return OK;
 }
 
@@ -92,8 +93,9 @@ int BinaryFile::CreateMasterFile(bool en, uint32_t size,
 
 	if (master && (*detIndex==0)) {
 		masterFileName = BinaryFileStatic::CreateMasterFileName(filePath, fileNamePrefix, *fileIndex);
-		if(!silentMode)
+		if(!silentMode) {
 			FILE_LOG(logINFO) << "Master File: " << masterFileName;
+		}
 		return BinaryFileStatic::CreateMasterDataFile(masterfd, masterFileName, *overWriteEnable,
 				*dynamicRange, en, size, nx, ny, *numImages,
 				at, st, ap, BINARY_WRITER_VERSION);