diff --git a/serverdata/static/spawns.db b/serverdata/static/spawns.db
deleted file mode 100644
index b6deebec9..000000000
Binary files a/serverdata/static/spawns.db and /dev/null differ
diff --git a/src/resources/server_info/RelationalServerData.java b/src/resources/server_info/RelationalServerData.java
index 260feab6a..f14fb7887 100644
--- a/src/resources/server_info/RelationalServerData.java
+++ b/src/resources/server_info/RelationalServerData.java
@@ -66,7 +66,7 @@ public class RelationalServerData extends RelationalDatabase {
 		long sdbModified = sdb.lastModified();
 		long imported = getLastImported(table);
 		if (sdbModified > imported) {
-			updateQuery("DROP TABLE " + table);
+			updateQuery("DROP TABLE IF EXISTS " + table);
 			importFromSdb(table, sdb);
 			updateLastImported(table, System.currentTimeMillis());
 		}
diff --git a/src/services/spawn/StaticService.java b/src/services/spawn/StaticService.java
index 059cb35cf..41ff5557b 100644
--- a/src/services/spawn/StaticService.java
+++ b/src/services/spawn/StaticService.java
@@ -41,7 +41,7 @@ import services.objects.ObjectManager;
 
 public class StaticService extends Service {
 	
-	private static final String GET_SUPPORTING_SQL = "SELECT spawn.* FROM static_spawns spawn, static_types types WHERE types.iff = ? AND spawn.iff_type = types.iff_type";
+	private static final String GET_SUPPORTING_SQL = "SELECT spawns.* FROM spawns, types WHERE types.iff = ? AND spawns.iff_type = types.iff_type";
 	
 	private final Object databaseMutex;
 	private final ObjectManager objectManager;
@@ -54,8 +54,8 @@ public class StaticService extends Service {
 		
 		spawnDatabase = new RelationalServerData("serverdata/static/spawns.db");
 		try {
-			spawnDatabase.linkTableWithSdb("static_spawns", "serverdata/static/spawns.sdb");
-			spawnDatabase.linkTableWithSdb("static_types", "serverdata/static/types.sdb");
+			spawnDatabase.linkTableWithSdb("spawns", "serverdata/static/spawns.sdb");
+			spawnDatabase.linkTableWithSdb("types", "serverdata/static/types.sdb");
 		} catch (FileNotFoundException e) {
 			e.printStackTrace();
 			throw new main.ProjectSWG.CoreException("Unable to load sdb files for StaticService");