diff --git a/engine/client/cl_parse_gs.c b/engine/client/cl_parse_gs.c
index e4611cfb..080613e8 100644
--- a/engine/client/cl_parse_gs.c
+++ b/engine/client/cl_parse_gs.c
@@ -82,7 +82,7 @@ static void CL_ParseNewMovevars( sizebuf_t *msg )
 	if( Q_strcmp( clgame.oldmovevars.skyName, clgame.movevars.skyName ) && cl.video_prepped )
 		R_SetupSky( clgame.movevars.skyName );
 
-	memcpy( &clgame.oldmovevars, &clgame.movevars, sizeof( movevars_t ));
+	clgame.oldmovevars = clgame.movevars;
 	clgame.entities->curstate.scale = clgame.movevars.waveHeight;
 
 	// keep features an actual!
diff --git a/engine/common/net_encode.c b/engine/common/net_encode.c
index f87de4e1..65c020fa 100644
--- a/engine/common/net_encode.c
+++ b/engine/common/net_encode.c
@@ -1321,7 +1321,6 @@ static qboolean Delta_WriteField( sizebuf_t *msg, delta_t *pField, const void *f
 	Delta_WriteField_( msg, pField, from, to, timebase );
 
 	return true;
-	return true;
 }
 
 /*
diff --git a/engine/server/sv_client.c b/engine/server/sv_client.c
index 81fdef67..6d553cfe 100644
--- a/engine/server/sv_client.c
+++ b/engine/server/sv_client.c
@@ -1342,9 +1342,8 @@ otherwise see code SV_UpdateMovevars()
 */
 void SV_FullUpdateMovevars( sv_client_t *cl, sizebuf_t *msg )
 {
-	movevars_t	nullmovevars;
+	const movevars_t nullmovevars = { 0 };
 
-	memset( &nullmovevars, 0, sizeof( nullmovevars ));
 	MSG_WriteDeltaMovevars( msg, &nullmovevars, &svgame.movevars );
 }