diff --git a/config/mv_checks.xml b/config/mv_checks.xml
index 96e2788c..64c45df9 100644
--- a/config/mv_checks.xml
+++ b/config/mv_checks.xml
@@ -93,7 +93,9 @@
         </module>
         <module name="IllegalInstantiation"/>
         <module name="InnerAssignment"/>
-        <module name="MagicNumber"/>
+        <module name="MagicNumber">
+            <property name="ignoreNumbers" value="-1, 0, 1, 2, 8"/>
+        </module>
         <module name="MissingSwitchDefault"/>
         <module name="RedundantThrows"/>
         <module name="SimplifyBooleanExpression"/>
diff --git a/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java b/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java
index 782557d5..58eadf93 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java
@@ -830,6 +830,9 @@ public class MVWorld implements MultiverseWorld {
         this.saveConfig();
     }
 
+    private static final int SPAWN_LOCATION_SEARCH_TOLERANCE = 16;
+    private static final int SPAWN_LOCATION_SEARCH_RADIUS = 16;
+
     private Location readSpawnFromConfig(World w) {
         Location spawnLocation = w.getSpawnLocation();
         Location configLocation = this.getSpawnLocation();
@@ -850,7 +853,8 @@ public class MVWorld implements MultiverseWorld {
             // If it's not, find a better one.
             this.plugin.log(Level.WARNING, "Spawn location from world.dat file was unsafe. Adjusting...");
             this.plugin.log(Level.WARNING, "Original Location: " + LocationManipulation.strCoordsRaw(spawnLocation));
-            Location newSpawn = teleporter.getSafeLocation(spawnLocation, 16, 16);
+            Location newSpawn = teleporter.getSafeLocation(spawnLocation,
+                    SPAWN_LOCATION_SEARCH_TOLERANCE, SPAWN_LOCATION_SEARCH_RADIUS);
             // I think we could also do this, as I think this is what Notch does.
             // Not sure how it will work in the nether...
             //Location newSpawn = this.spawnLocation.getWorld().getHighestBlockAt(this.spawnLocation).getLocation();