diff --git a/slsReceiverSoftware/include/GeneralData.h b/slsReceiverSoftware/include/GeneralData.h
index d58671040..680cf35c1 100644
--- a/slsReceiverSoftware/include/GeneralData.h
+++ b/slsReceiverSoftware/include/GeneralData.h
@@ -382,7 +382,7 @@ private:
 	{
 		jfrau_packet_header_t* header = (jfrau_packet_header_t*)(packetData);
 		frameNumber = (uint64_t)(*( (uint32_t*) header->frameNumber));
-		packetNumber = (uint32_t)(*( (uint8_t*) header->packetNumber));
+		packetNumber = packetsPerFrame -1 - (uint32_t)(*( (uint8_t*) header->packetNumber));
 	}
 
 	/**
@@ -401,7 +401,7 @@ private:
 		subFrameNumber = -1;
 		jfrau_packet_header_t* header = (jfrau_packet_header_t*)(packetData);
 		frameNumber = (uint64_t)(*( (uint32_t*) header->frameNumber));
-		packetNumber = (uint32_t)(*( (uint8_t*) header->packetNumber));
+		packetNumber = packetsPerFrame - 1 -(uint32_t)(*( (uint8_t*) header->packetNumber));
 		bunchId = (*((uint64_t*) header->bunchid));
 	}
 
diff --git a/slsReceiverSoftware/include/ZmqSocket.h b/slsReceiverSoftware/include/ZmqSocket.h
index 1f02bd2e0..f4a9f2483 100644
--- a/slsReceiverSoftware/include/ZmqSocket.h
+++ b/slsReceiverSoftware/include/ZmqSocket.h
@@ -319,7 +319,7 @@ public:
 		printf("%d: type: %s\n", index, d["type"].GetString());
 #endif
 
-		if(d["acqIndex"].GetInt()!=-1){
+		if(d["acqIndex"].GetUint64()!=-1){
 			acqIndex 		= d["acqIndex"].GetUint64();
 			frameIndex 		= d["fIndex"].GetUint64();
 			subframeIndex 	= d["subfnum"].GetUint();
diff --git a/slsReceiverSoftware/src/DataStreamer.cpp b/slsReceiverSoftware/src/DataStreamer.cpp
index 21a2fc167..1a50c321a 100644
--- a/slsReceiverSoftware/src/DataStreamer.cpp
+++ b/slsReceiverSoftware/src/DataStreamer.cpp
@@ -31,8 +31,8 @@ const char* DataStreamer::jsonHeaderFormat_part1 =
 
 const char* DataStreamer::jsonHeaderFormat =
 		"%s"
-		"\"acqIndex\":%lld, "
-		"\"fIndex\":%lld, "
+		"\"acqIndex\":%llu, "
+		"\"fIndex\":%llu, "
 		"\"subfnum\":%u, "
 		"\"fname\":\"%s\"}";
 
diff --git a/slsReceiverSoftware/src/Listener.cpp b/slsReceiverSoftware/src/Listener.cpp
index 3eb04c5cc..adeb0110d 100644
--- a/slsReceiverSoftware/src/Listener.cpp
+++ b/slsReceiverSoftware/src/Listener.cpp
@@ -331,7 +331,8 @@ uint32_t Listener::ListenToAnImage(char* buf) {
 		generalData->GetHeaderInfo(index, listeningPacket, *dynamicRange, fnum, pnum, snum, bid);
 		lastCaughtFrameIndex = fnum;
 #ifdef VERBOSE
-		if (!index && !pnum) cprintf(GREEN,"Listening %d: fnum:%lld, pnum:%d\n", index, (long long int)fnum, pnum);
+		if (!index && !pnum)
+			cprintf(GREEN,"Listening %d: fnum:%lld, pnum:%d\n", index, (long long int)fnum, pnum);
 #endif
 		if (!measurementStartedFlag)
 			RecordFirstIndices(fnum);
diff --git a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
index 68648c758..14fd6dcab 100644
--- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
+++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
@@ -757,7 +757,8 @@ int slsReceiverTCPIPInterface::setup_udp(){
 			sscanf(args[1],"%d",&udpport);
 			sscanf(args[2],"%d",&udpport2);
 			receiverBase->setUDPPortNumber(udpport);
-			receiverBase->setUDPPortNumber2(udpport2);
+			if (myDetectorType == EIGER)
+				receiverBase->setUDPPortNumber2(udpport2);
 			//setup udpip
 			//get ethernet interface or IP to listen to
 			FILE_LOG(logINFO) << "Receiver UDP IP: " << args[0];