diff --git a/qw/source/sv_demo.c b/qw/source/sv_demo.c
index 951cf19de..f315de5de 100644
--- a/qw/source/sv_demo.c
+++ b/qw/source/sv_demo.c
@@ -527,8 +527,8 @@ SV_Stop (int reason)
 	demo.dbuf->h = NULL;
 	demo.dbuf->bufsize = 0;
 	DemoWrite_Begin (dem_all, 0, 2 + strlen ("EndOfDemo"));
-	MSG_WriteByte ((sizebuf_t *) demo.dbuf, svc_disconnect);
-	MSG_WriteString ((sizebuf_t *) demo.dbuf, "EndOfDemo");
+	MSG_WriteByte (&demo.dbuf->sz, svc_disconnect);
+	MSG_WriteString (&demo.dbuf->sz, "EndOfDemo");
 
 	SV_DemoWritePackets (demo.parsecount - demo.lastwritten + 1);
 	// finish up
@@ -603,12 +603,12 @@ SV_DemoPings (void)
 			continue;
 
 		DemoWrite_Begin (dem_all, 0, 7);
-		MSG_WriteByte ((sizebuf_t *) demo.dbuf, svc_updateping);
-		MSG_WriteByte ((sizebuf_t *) demo.dbuf, j);
-		MSG_WriteShort ((sizebuf_t *) demo.dbuf, SV_CalcPing (client));
-		MSG_WriteByte ((sizebuf_t *) demo.dbuf, svc_updatepl);
-		MSG_WriteByte ((sizebuf_t *) demo.dbuf, j);
-		MSG_WriteByte ((sizebuf_t *) demo.dbuf, client->lossage);
+		MSG_WriteByte (&demo.dbuf->sz, svc_updateping);
+		MSG_WriteByte (&demo.dbuf->sz, j);
+		MSG_WriteShort (&demo.dbuf->sz, SV_CalcPing (client));
+		MSG_WriteByte (&demo.dbuf->sz, svc_updatepl);
+		MSG_WriteByte (&demo.dbuf->sz, j);
+		MSG_WriteByte (&demo.dbuf->sz, client->lossage);
 	}
 }
 
diff --git a/qw/source/sv_send.c b/qw/source/sv_send.c
index ec5f0b176..d9daa77df 100644
--- a/qw/source/sv_send.c
+++ b/qw/source/sv_send.c
@@ -642,7 +642,7 @@ SV_SendClientDatagram (client_t *client)
 		SZ_Clear (&msg);
 	}
 	// send the datagram
-	Netchan_Transmit (&client->netchan, msg.cursize, buf);
+	Netchan_Transmit (&client->netchan, msg.cursize, msg.data);
 
 	return true;
 }
@@ -778,17 +778,6 @@ SV_SendClientMessages (void)
 
 			// if the reliable message overflowed, drop the client
 			if (c->netchan.message.overflowed) {
-#if 0
-				int i;
-
-				Analyze_Server_Packet (c->netchan.message.data,
-									   c->netchan.message.cursize, 0);
-
-				for (i = 0; i < c->num_backbuf; i++) {
-					Analyze_Server_Packet (c->backbuf_data[i],
-										   c->backbuf_size[i], 0);
-				}
-#endif
 				SZ_Clear (&c->netchan.message);
 				SZ_Clear (&c->datagram);
 				SV_BroadcastPrintf (PRINT_HIGH, "%s overflowed\n", c->name);