diff --git a/src/game/g_spawn.c b/src/game/g_spawn.c
index 7e78dfbeb..dfe8c1faa 100644
--- a/src/game/g_spawn.c
+++ b/src/game/g_spawn.c
@@ -271,6 +271,7 @@ StaticSpawnSearch(const char *classname)
 	return NULL;
 }
 
+
 /*
  * Finds the spawn function for
  * the entity and calls it
@@ -498,7 +499,6 @@ ED_ParseField(const char *key, const char *value, edict_t *ent)
 	byte *b;
 	float v;
 	vec3_t vec;
-	int color[4];
 
 	if (!ent || !value || !key)
 	{
diff --git a/src/game/savegame/tables/fields.h b/src/game/savegame/tables/fields.h
index b3323cfaa..d3c619776 100644
--- a/src/game/savegame/tables/fields.h
+++ b/src/game/savegame/tables/fields.h
@@ -113,15 +113,14 @@
 {"maxyaw", STOFS(maxyaw), F_FLOAT, FFL_SPAWNTEMP},
 {"minpitch", STOFS(minpitch), F_FLOAT, FFL_SPAWNTEMP},
 {"maxpitch", STOFS(maxpitch), F_FLOAT, FFL_SPAWNTEMP},
-{"music", STOFS(music), F_LSTRING, FFL_SPAWNTEMP},
-{"nextmap", STOFS(nextmap), F_LSTRING, FFL_SPAWNTEMP},
+{"music", STOFS(music), F_LRAWSTRING, FFL_SPAWNTEMP},
+{"nextmap", STOFS(nextmap), F_LRAWSTRING, FFL_SPAWNTEMP},
 {"skinnum", FOFS(s.skinnum), F_INT},
 {"time", FOFS(time), F_FLOAT},
 {"text_msg", FOFS(text_msg), F_LSTRING},
 {"jumptarget", FOFS(jumptarget), F_LSTRING},
 {"scripttarget", FOFS(scripttarget), F_LSTRING},
 {"materialtype", FOFS(materialtype), F_INT},
-{"scale", FOFS(s.scale), F_FLOAT},
 {"color", FOFS(s.color), F_RGBA},
 {"frame", FOFS(s.frame), F_INT},
 {"mintel", FOFS(mintel), F_INT},