diff --git a/src/lib/global/sect.c b/src/lib/global/sect.c
index ce0068dd..fc439634 100644
--- a/src/lib/global/sect.c
+++ b/src/lib/global/sect.c
@@ -42,7 +42,7 @@
 #include "product.h"
 
 struct dchrstr bigcity_dchr = {
-    'c', 0, 2, NAV_02, UPKG, 1.0, 2.0, 30, 0, 10, 1, 2, 9999, "city"
+    'c', 0, 2, NAV_02, UPKG, 1.0, 2.0, 30, 0, 10, 1, 2, 999, "city"
 };
 
 struct dchrstr dchr[SCT_MAXDEF + 2] = {
@@ -50,7 +50,7 @@ struct dchrstr dchr[SCT_MAXDEF + 2] = {
   mnem prd     mcst  flg    pkg ostr dstr value $ bld lcm hcm maxpop  name    */
     {'.', 0, 0, NAVOK, NPKG, 0.0, 0.0, 0, -1, 0, 0, 0, 0, "sea"},
     {'^', P_MDUST, 25, 0, NPKG, 1.0, 4.0, 5, -1, 1, 0, 0, 99, "mountain"},
-    {'s', 0, 0, 0, NPKG, 0.0, 99.0, 127, -1, 0, 0, 0, 9999, "sanctuary"},
+    {'s', 0, 0, 0, NPKG, 0.0, 99.0, 127, -1, 0, 0, 0, 999, "sanctuary"},
     {'\\', 0, 0, 0, NPKG, 0.0, 99.0, 0, -1, 0, 0, 0, 0, "wasteland"},
     {'-', 0, 3, 0, NPKG, 1.0, 2.0, 1, 0, 0, 0, 0, 999, "wilderness"},
     {'c', 0, 2, 0, NPKG, 1.0, 2.0, 30, 0, 1, 0, 0, 999, "capital"},
@@ -80,7 +80,7 @@ struct dchrstr dchr[SCT_MAXDEF + 2] = {
     {'b', P_BAR, 2, 0, BPKG, 1.0, 2.25, 10, 0, 1, 0, 0, 999, "bank"},
     {'%', P_PETROL, 2, 0, NPKG, 1.0, 1.5, 2, 0, 1, 0, 0, 999, "refinery"},
     {'e', 0, 2, 0, NPKG, 1.0, 2.0, 7, 0, 1, 0, 0, 999, "enlistment center"},
-    {'~', 0, 2, 0, NPKG, 1.0, 1.5, 1, -1, 1, 0, 0, 50, "plains"},
+    {'~', 0, 2, 0, NPKG, 1.0, 1.5, 1, -1, 1, 0, 0, 49, "plains"},
     {'@', 0, 1, 0, NPKG, 1.0, 1.5, 4, -1, 1, 0, 0, 999, "bridge tower"},
     {0, 0, 0, 0, IPKG, 0, 0, 0, 0, 0, 0, 0, 0, NULL},
     {0, 0, 0, 0, IPKG, 0, 0, 0, 0, 0, 0, 0, 0, NULL}
diff --git a/src/server/main.c b/src/server/main.c
index bcb08041..21862244 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -484,14 +484,8 @@ nullify_objects(void)
 {
     int i, j;
 
-    if (opt_BIG_CITY) {
-	dchr[SCT_CAPIT].d_flg = bigcity_dchr.d_flg;
-	dchr[SCT_CAPIT].d_pkg = bigcity_dchr.d_pkg;
-	dchr[SCT_CAPIT].d_build = bigcity_dchr.d_build;
-	dchr[SCT_CAPIT].d_lcms = bigcity_dchr.d_lcms;
-	dchr[SCT_CAPIT].d_hcms = bigcity_dchr.d_hcms;
-	dchr[SCT_CAPIT].d_name = bigcity_dchr.d_name;
-    }
+    if (opt_BIG_CITY)
+	dchr[SCT_CAPIT] = bigcity_dchr;
     if (opt_NO_LCMS)
 	dchr[SCT_LIGHT].d_cost = -1;
     if (opt_NO_HCMS)