diff --git a/neo/game/Game_local.cpp b/neo/game/Game_local.cpp
index 3b99f75d..0f9cbae0 100644
--- a/neo/game/Game_local.cpp
+++ b/neo/game/Game_local.cpp
@@ -1257,8 +1257,8 @@ bool idGameLocal::InitFromSaveGame( const char *mapName, idRenderWorld *renderWo
 
 		if ( !InhibitEntitySpawn( mapEnt->epairs ) ) {
 			CacheDictionaryMedia( &mapEnt->epairs );
-			const char *classname = mapEnt->epairs.GetString( "classname" );
-			if ( classname != '\0' ) {
+			const char *classname;
+			if ( mapEnt->epairs.GetString( "classname", "", &classname ) ) {
 				FindEntityDef( classname, false );
 			}
 		}
@@ -1626,8 +1626,9 @@ void idGameLocal::GetShakeSounds( const idDict *dict ) {
 	const char *soundShaderName;
 	idStr soundName;
 
-	soundShaderName = dict->GetString( "s_shader" );
-	if ( soundShaderName != '\0' && dict->GetFloat( "s_shakes" ) != 0.0f ) {
+	if ( dict->GetString( "s_shader", "", &soundShaderName )
+		 && dict->GetFloat( "s_shakes" ) != 0.0f )
+	{
 		soundShader = declManager->FindSound( soundShaderName );
 
 		for ( int i = 0; i < soundShader->GetNumSounds(); i++ ) {
diff --git a/neo/renderer/Model_liquid.cpp b/neo/renderer/Model_liquid.cpp
index e5d3daf2..ff7fb87b 100644
--- a/neo/renderer/Model_liquid.cpp
+++ b/neo/renderer/Model_liquid.cpp
@@ -399,8 +399,6 @@ void idRenderModelLiquid::InitFromFile( const char *fileName ) {
 		} else if ( !token.Icmp( "shader" ) ) {
 			parser.ReadToken( &token );
 			shader = declManager->FindMaterial( token );
-		} else if ( !token.Icmp( "seed" ) ) {
-			seed = parser.ParseInt();
 		} else if ( !token.Icmp( "update_rate" ) ) {
 			rate = parser.ParseFloat();
 			if ( ( rate <= 0.0f ) || ( rate > 60.0f ) ) {
diff --git a/neo/tools/radiant/XYWnd.cpp b/neo/tools/radiant/XYWnd.cpp
index 7d58e994..8911d205 100644
--- a/neo/tools/radiant/XYWnd.cpp
+++ b/neo/tools/radiant/XYWnd.cpp
@@ -4285,7 +4285,7 @@ void CXYWnd::Paste()
 
 		int		nLen = g_Clipboard.GetLength();
 		char	*pBuffer = new char[nLen + 1];
-		memset(pBuffer, 0, sizeof(pBuffer));
+		memset(pBuffer, 0, sizeof(*pBuffer) * (nLen + 1));
 		g_Clipboard.Read(pBuffer, nLen);
 		pBuffer[nLen] = '\0';
 		Map_ImportBuffer(pBuffer, !(GetAsyncKeyState(VK_SHIFT) & 0x8000));
diff --git a/neo/tools/radiant/splines.cpp b/neo/tools/radiant/splines.cpp
index babcd531..9a93ea08 100644
--- a/neo/tools/radiant/splines.cpp
+++ b/neo/tools/radiant/splines.cpp
@@ -1565,10 +1565,6 @@ bool idCameraPosition::parseToken( const idStr &key, idParser *src ) {
 		name = token;
 		return true;
 	}
-	else if ( !key.Icmp( "time" ) ) {
-		time = src->ParseInt();
-		return true;
-	}
 	else {
 		src->Error( "unknown camera position key: %s", key.c_str() );
 		return false;