diff --git a/Source/msg.cpp b/Source/msg.cpp
index 4b8e0b9f0..c805ace19 100644
--- a/Source/msg.cpp
+++ b/Source/msg.cpp
@@ -60,7 +60,7 @@ int sgnCurrMegaPlayer;
 DLevel sgLevels[NUMLEVELS];
 BYTE sbLastCmd;
 byte sgRecvBuf[sizeof(DLevel) + 1];
-BYTE sgbRecvCmd;
+_cmd_id sgbRecvCmd;
 LocalLevel sgLocals[NUMLEVELS];
 DJunk sgJunk;
 bool sgbDeltaChanged;
@@ -309,7 +309,7 @@ DWORD CompressData(byte *buffer, byte *end)
 	return pkSize + 1;
 }
 
-void DeltaImportData(BYTE cmd, DWORD recvOffset)
+void DeltaImportData(_cmd_id cmd, DWORD recvOffset)
 {
 	if (sgRecvBuf[0] != byte { 0 })
 		PkwareDecompress(&sgRecvBuf[1], recvOffset, sizeof(sgRecvBuf) - 1);
@@ -318,7 +318,7 @@ void DeltaImportData(BYTE cmd, DWORD recvOffset)
 	if (cmd == CMD_DLEVEL_JUNK) {
 		DeltaImportJunk(src);
 	} else if (cmd >= CMD_DLEVEL_0 && cmd <= CMD_DLEVEL_24) {
-		BYTE i = cmd - CMD_DLEVEL_0;
+		uint8_t i = cmd - CMD_DLEVEL_0;
 		src += DeltaImportItem(src, sgLevels[i].item);
 		src += DeltaImportObject(src, sgLevels[i].object);
 		DeltaImportMonster(src, sgLevels[i].monster);
@@ -332,42 +332,43 @@ void DeltaImportData(BYTE cmd, DWORD recvOffset)
 
 DWORD OnLevelData(int pnum, const TCmd *pCmd)
 {
-	auto *p = (TCmdPlrInfoHdr *)pCmd;
+	const auto &message = *reinterpret_cast<const TCmdPlrInfoHdr *>(pCmd);
 
 	if (gbDeltaSender != pnum) {
-		if (p->bCmd == CMD_DLEVEL_END || (p->bCmd == CMD_DLEVEL_0 && p->wOffset == 0)) {
-			gbDeltaSender = pnum;
-			sgbRecvCmd = CMD_DLEVEL_END;
-		} else {
-			return p->wBytes + sizeof(*p);
+		if (message.bCmd != CMD_DLEVEL_END && (message.bCmd != CMD_DLEVEL_0 || message.wOffset != 0)) {
+			return message.wBytes + sizeof(message);
 		}
+
+		gbDeltaSender = pnum;
+		sgbRecvCmd = CMD_DLEVEL_END;
 	}
+
 	if (sgbRecvCmd == CMD_DLEVEL_END) {
-		if (p->bCmd == CMD_DLEVEL_END) {
+		if (message.bCmd == CMD_DLEVEL_END) {
 			sgbDeltaChunks = MAX_CHUNKS - 1;
-			return p->wBytes + sizeof(*p);
+			return message.wBytes + sizeof(message);
 		}
-		if (p->bCmd == CMD_DLEVEL_0 && p->wOffset == 0) {
-			sgdwRecvOffset = 0;
-			sgbRecvCmd = p->bCmd;
-		} else {
-			return p->wBytes + sizeof(*p);
+		if (message.bCmd != CMD_DLEVEL_0 || message.wOffset != 0) {
+			return message.wBytes + sizeof(message);
 		}
-	} else if (sgbRecvCmd != p->bCmd) {
+
+		sgdwRecvOffset = 0;
+		sgbRecvCmd = message.bCmd;
+	} else if (sgbRecvCmd != message.bCmd) {
 		DeltaImportData(sgbRecvCmd, sgdwRecvOffset);
-		if (p->bCmd == CMD_DLEVEL_END) {
+		if (message.bCmd == CMD_DLEVEL_END) {
 			sgbDeltaChunks = MAX_CHUNKS - 1;
 			sgbRecvCmd = CMD_DLEVEL_END;
-			return p->wBytes + sizeof(*p);
+			return message.wBytes + sizeof(message);
 		}
 		sgdwRecvOffset = 0;
-		sgbRecvCmd = p->bCmd;
+		sgbRecvCmd = message.bCmd;
 	}
 
-	assert(p->wOffset == sgdwRecvOffset);
-	memcpy(&sgRecvBuf[p->wOffset], &p[1], p->wBytes);
-	sgdwRecvOffset += p->wBytes;
-	return p->wBytes + sizeof(*p);
+	assert(message.wOffset == sgdwRecvOffset);
+	memcpy(&sgRecvBuf[message.wOffset], &message + sizeof(message), message.wBytes);
+	sgdwRecvOffset += message.wBytes;
+	return message.wBytes + sizeof(message);
 }
 
 void DeltaSyncGolem(const TCmdGolem *pG, int pnum, BYTE bLevel)
diff --git a/Source/multi.cpp b/Source/multi.cpp
index da92c2a7f..3e1be0339 100644
--- a/Source/multi.cpp
+++ b/Source/multi.cpp
@@ -634,45 +634,34 @@ void multi_process_network_packets()
 void multi_send_zero_packet(int pnum, _cmd_id bCmd, const byte *data, size_t size)
 {
 	assert(pnum != MyPlayerId);
-	assert(data);
+	assert(data != nullptr);
 	assert(size <= 0x0ffff);
 
-	uint32_t dwOffset = 0;
-
-	while (size != 0) {
-		TPkt pkt;
+	for (size_t offset = 0; offset < size;) {
+		TPkt pkt {};
 		pkt.hdr.wCheck = LoadBE32("\0\0ip");
-		pkt.hdr.px = 0;
-		pkt.hdr.py = 0;
-		pkt.hdr.targx = 0;
-		pkt.hdr.targy = 0;
-		pkt.hdr.php = 0;
-		pkt.hdr.pmhp = 0;
-		pkt.hdr.bstr = 0;
-		pkt.hdr.bmag = 0;
-		pkt.hdr.bdex = 0;
-		auto *p = (TCmdPlrInfoHdr *)pkt.body;
-		p->bCmd = bCmd;
-		p->wOffset = dwOffset;
-		size_t dwBody = gdwLargestMsgSize - sizeof(pkt.hdr) - sizeof(*p);
-		if (size < dwBody) {
-			dwBody = size;
-		}
+		auto &message = *reinterpret_cast<TCmdPlrInfoHdr *>(pkt.body);
+		message.bCmd = bCmd;
+		message.wOffset = offset;
+
+		size_t dwBody = gdwLargestMsgSize - sizeof(pkt.hdr) - sizeof(message);
+		dwBody = std::min(dwBody, size - offset);
 		assert(dwBody <= 0x0ffff);
-		p->wBytes = dwBody;
-		memcpy(&pkt.body[sizeof(*p)], data, p->wBytes);
+		message.wBytes = dwBody;
+
+		memcpy(&pkt.body[sizeof(message)], &data[offset], message.wBytes);
+
 		size_t dwMsg = sizeof(pkt.hdr);
-		dwMsg += sizeof(*p);
-		dwMsg += p->wBytes;
+		dwMsg += sizeof(message);
+		dwMsg += message.wBytes;
 		pkt.hdr.wLen = dwMsg;
+
 		if (!SNetSendMessage(pnum, &pkt, dwMsg)) {
 			nthread_terminate_game("SNetSendMessage2");
 			return;
 		}
 
-		data += p->wBytes;
-		size -= p->wBytes;
-		dwOffset += p->wBytes;
+		offset += message.wBytes;
 	}
 }