diff --git a/data/core/game_balance.json b/data/core/game_balance.json
index 943db9ec4db87..7ebb00410852a 100644
--- a/data/core/game_balance.json
+++ b/data/core/game_balance.json
@@ -107,7 +107,7 @@
   {
     "type": "EXTERNAL_OPTION",
     "name": "SPAWN_CITY_HORDE_THRESHOLD",
-    "info": "Minimum city size to guarantee extra zombies are spawned in cities. 0 means all cities spawn extra zombies. Negative values disable extra city zombies.",
+    "info": "Minimum city size to guarantee extra zombies are spawned in cities.  0 means all cities spawn extra zombies.  Negative values disable extra city zombies.",
     "stype": "int",
     "value": 4
   },
diff --git a/src/overmap.cpp b/src/overmap.cpp
index ce5b17c614e5e..9cfb8dbcebf76 100644
--- a/src/overmap.cpp
+++ b/src/overmap.cpp
@@ -6631,9 +6631,9 @@ void overmap::place_mongroups()
                             // get all four quadrants for better distribution.
                             std::vector<tripoint_abs_sm> local_sm_list;
                             local_sm_list.push_back( this_sm );
-                            local_sm_list.push_back( this_sm + point( 0, 1 ) );
-                            local_sm_list.push_back( this_sm + point( 1, 0 ) );
-                            local_sm_list.push_back( this_sm + point( 1, 1 ) );
+                            local_sm_list.push_back( this_sm + point_east );
+                            local_sm_list.push_back( this_sm + point_south );
+                            local_sm_list.push_back( this_sm + point_south_east );
 
                             // shuffle, then prune submaps based on distance from city center
                             // this should let us concentrate hordes closer to the center.
@@ -6654,12 +6654,12 @@ void overmap::place_mongroups()
                     // somehow the city has no roads. this shouldn't happen.
                     add_msg_debug( debugmode::DF_OVERMAP,
                                    "tried to add zombie hordes to city %s centered at omt %s, but there were no roads!",
-                                   elem.name, city_center.to_string() );
+                                   elem.name, city_center.to_string_writable() );
                     continue;
                 }
 
                 add_msg_debug( debugmode::DF_OVERMAP, "adding %i zombies in hordes to city %s centered at omt %s.",
-                               desired_zombies, elem.name, city_center.to_string() );
+                               desired_zombies, elem.name, city_center.to_string_writable() );
 
                 // if there aren't enough roads, we'll just reuse them, re-shuffled.
                 while( desired_zombies > 0 ) {
diff --git a/src/overmap_ui.cpp b/src/overmap_ui.cpp
index 44b8263af4a33..6ae11cfe9f23c 100644
--- a/src/overmap_ui.cpp
+++ b/src/overmap_ui.cpp
@@ -93,8 +93,8 @@ static const oter_str_id oter_unexplored( "unexplored" );
 
 static const oter_type_str_id oter_type_forest_trail( "forest_trail" );
 
-static const trait_id trait_DEBUG_NIGHTVISION( "DEBUG_NIGHTVISION" );
 static const trait_id trait_DEBUG_CLAIRVOYANCE( "DEBUG_CLAIRVOYANCE" );
+static const trait_id trait_DEBUG_NIGHTVISION( "DEBUG_NIGHTVISION" );
 
 #if defined(__ANDROID__)
 #include <SDL_keyboard.h>
diff --git a/src/sdltiles.cpp b/src/sdltiles.cpp
index 0d8fb26199255..f42594d018975 100644
--- a/src/sdltiles.cpp
+++ b/src/sdltiles.cpp
@@ -99,8 +99,8 @@
 
 static const oter_type_str_id oter_type_forest_trail( "forest_trail" );
 
-static const trait_id trait_DEBUG_NIGHTVISION( "DEBUG_NIGHTVISION" );
 static const trait_id trait_DEBUG_CLAIRVOYANCE( "DEBUG_CLAIRVOYANCE" );
+static const trait_id trait_DEBUG_NIGHTVISION( "DEBUG_NIGHTVISION" );
 
 //***********************************
 //Globals                           *