diff --git a/groundStation/adapters/crazyflie/src/cf_adapter.c b/groundStation/adapters/crazyflie/src/cf_adapter.c
index 84871e5b427c5df325c72d548198dfb3439a1567..9cc1912ded91d354c4b3a91246393da848d1e6b7 100644
--- a/groundStation/adapters/crazyflie/src/cf_adapter.c
+++ b/groundStation/adapters/crazyflie/src/cf_adapter.c
@@ -267,11 +267,11 @@ size_t getSinglePacket(int fd, uint8_t * packet, int pSize){
 
     //Get to data size bytes to find out total packet size
     while(curLoc<6){
-        curLoc += recv(fd, packet,6,MSG_WAITALL);
+        curLoc += recv(fd, packet,7,MSG_WAITALL);
     }
 
     //get the total packet size
-    totalPacketSize = packetSize(*(packet+4)<<8 | (*(packet +5)));
+    totalPacketSize = packetSize(*(packet+5)<<8 | (*(packet +6)));
     printf("\t\ttotal packet size %d\n",totalPacketSize);
 
     //check that the total packet size isnt unreasonable TODO is this a valid check?
diff --git a/groundStation/src/backend/packet.c b/groundStation/src/backend/packet.c
index 020827e58832f8e3a94b1cdf35a0a2ef357ac399..bbbaf67f1b5f98fa885d58a9c7700125d12c7c6e 100644
--- a/groundStation/src/backend/packet.c
+++ b/groundStation/src/backend/packet.c
@@ -20,7 +20,7 @@ ssize_t EncodePacket(
 	packet[BEGIN] = BEGIN_CHAR;
 	packet[MTYPE_L] = LSByte16(m->msg_type);
 	packet[MTYPE_H] = MSByte16(m->msg_type);
-	memcpy(packet[ID_L], m->msg_id, 2);
+	memcpy(&packet[ID_L], &m->msg_id, 2);
 	packet[DLEN_L] = LSByte16(m->data_len);
 	packet[DLEN_H] = MSByte16(m->data_len);
 	memcpy(&packet[HDR_SIZE], data, m->data_len);