diff --git a/maps/mountain_fortress_v3/locomotive.lua b/maps/mountain_fortress_v3/locomotive.lua
index beaa4aeb..7cecbf33 100644
--- a/maps/mountain_fortress_v3/locomotive.lua
+++ b/maps/mountain_fortress_v3/locomotive.lua
@@ -1491,6 +1491,18 @@ local function on_player_changed_surface(event)
 
     local map_name = 'mountain_fortress_v3'
 
+    if player.surface.name == 'nauvis' then
+        local active_surface = WPT.get('active_surface_index')
+        local surface = game.surfaces[active_surface]
+        if not surface or not surface.valid then
+            return
+        end
+        player.teleport(
+            surface.find_non_colliding_position('character', game.forces.player.get_spawn_position(surface), 3, 0, 5),
+            surface
+        )
+    end
+
     if string.sub(player.surface.name, 0, #map_name) ~= map_name then
         return Public.add_player_to_permission_group(player, 'locomotive')
     else
diff --git a/utils/datastore/jail_data.lua b/utils/datastore/jail_data.lua
index 816ee411..ef12ed31 100644
--- a/utils/datastore/jail_data.lua
+++ b/utils/datastore/jail_data.lua
@@ -123,7 +123,7 @@ local vote_to_jail = function(player, griefer)
 end
 
 local vote_to_free = function(player, griefer)
-    if votejail[griefer] and not votefree[griefer] then
+    if votefree[griefer] and not votefree[griefer] then
         votefree[griefer] = {index = 0, actor = player.name}
         local message = player.name .. ' has started a vote to free player ' .. griefer
         Utils.print_to(nil, message)