diff --git a/src/Entity.c b/src/Entity.c
index 95a349f0a..69b0a3ce7 100644
--- a/src/Entity.c
+++ b/src/Entity.c
@@ -1062,12 +1062,12 @@ void LocalPlayers_MoveToSpawn(struct LocationUpdate* update) {
 }
 
 void LocalPlayer_CalcDefaultSpawn(struct LocalPlayer* p, struct LocationUpdate* update) {
-	float x = 0;//(World.Width  / 2) + 0.5f;
-	float z = 0;//(World.Length / 2) + 0.5f;
+	float x = (World.Width  / 2) + 0.5f;
+	float z = (World.Length / 2) + 0.5f;
 
 	update->flags = LU_HAS_POS | LU_HAS_YAW | LU_HAS_PITCH;
 	update->pos   = Respawn_FindSpawnPosition(x, z, p->Base.Size);
-	update->yaw   = 45.0f;
+	update->yaw   = 0.0f;
 	update->pitch = 0.0f;
 }
 
diff --git a/src/Server.c b/src/Server.c
index 6bbce5fbb..f6fea3c60 100644
--- a/src/Server.c
+++ b/src/Server.c
@@ -136,7 +136,7 @@ static void SPConnection_BeginConnect(void) {
 	horSize = 16;
 	verSize = 16;
 #elif defined CC_BUILD_LOWMEM
-	horSize = 128;
+	horSize = 64;
 	verSize = 64;
 #else
 	horSize = Game_ClassicMode ? 256 : 128;
@@ -150,7 +150,7 @@ static void SPConnection_BeginConnect(void) {
 	Gen_Active = &NotchyGen;
 #endif
 
-	Gen_Seed   = 6789;;//Random_Next(&rnd, Int32_MaxValue);
+	Gen_Seed   = Random_Next(&rnd, Int32_MaxValue);
 	Gen_Start();
 
 	GeneratingScreen_Show();
diff --git a/src/Window_MSDOS.c b/src/Window_MSDOS.c
index a1cc10a97..a17df4a0a 100644
--- a/src/Window_MSDOS.c
+++ b/src/Window_MSDOS.c
@@ -14,6 +14,7 @@
 
 #define INT_VGA            0x10
 #define VGA_CMD_SETMODE  0x0000
+#define VGA_MODE_TEXT_BW   0x02
 #define VGA_MODE_320x200_8 0x13
 
 #define INT_MOUSE         0x33
@@ -199,7 +200,11 @@ void Window_Free(void) {
 	Mem_Set(screen, 0, DISP_WIDTH * DISP_HEIGHT);
 
 	__djgpp_nearptr_disable();
-	// TODO restore VGA mode and palette?
+
+	// Restore VGA to text mode
+	__dpmi_regs regs;
+	regs.x.ax = VGA_CMD_SETMODE | VGA_MODE_TEXT_BW;
+	__dpmi_int(INT_VGA, &regs);
 }
 
 static void DoCreateWindow(int width, int height) {