diff --git a/src/Game.c b/src/Game.c
index 6ad986fab..6bf45b4f2 100644
--- a/src/Game.c
+++ b/src/Game.c
@@ -508,15 +508,15 @@ static void UpdateViewMatrix(void) {
 static void Game_Render3D(double delta, float t) {
 	Vec3 pos;
 
+	EnvRenderer_UpdateFog();
 	if (EnvRenderer_ShouldRenderSkybox()) EnvRenderer_RenderSkybox();
+
 	AxisLinesRenderer_Render();
 	Entities_RenderModels(delta, t);
 	Entities_RenderNames();
 
 	Particles_Render(t);
 	Camera.Active->GetPickedBlock(&Game_SelectedPos); /* TODO: only pick when necessary */
-
-	EnvRenderer_UpdateFog();
 	EnvRenderer_RenderSky();
 	EnvRenderer_RenderClouds();
 
diff --git a/src/Server.c b/src/Server.c
index 39ec3ae63..434871a88 100644
--- a/src/Server.c
+++ b/src/Server.c
@@ -145,8 +145,8 @@ static void SPConnection_BeginConnect(void) {
 	}
 
 	Random_SeedFromCurrentTime(&rnd);
-	World_SetDimensions(128, 64, 128);
 	World_NewMap();
+	World_SetDimensions(128, 64, 128);
 
 	Gen_Vanilla = true;
 	Gen_Seed    = Random_Next(&rnd, Int32_MaxValue);