diff --git a/include/budg.h b/include/budg.h
index be130cd4..e6ecf144 100644
--- a/include/budg.h
+++ b/include/budg.h
@@ -51,11 +51,11 @@ void bp_put_avail(struct bp *, struct sctstr *, int);
 
 int get_materials(struct sctstr *, struct bp *, int *, int);
 
-extern long money[MAXNOC];
+extern int money[MAXNOC];
 extern int pops[MAXNOC];
-extern long sea_money[MAXNOC];
-extern long lnd_money[MAXNOC];
-extern long air_money[MAXNOC];
+extern int sea_money[MAXNOC];
+extern int lnd_money[MAXNOC];
+extern int air_money[MAXNOC];
 extern int tpops[MAXNOC];
 extern float levels[MAXNOC][4];
 
diff --git a/include/econfig-spec.h b/include/econfig-spec.h
index 5f665ed9..d00c9c1c 100644
--- a/include/econfig-spec.h
+++ b/include/econfig-spec.h
@@ -28,7 +28,7 @@
  *
  *  Known contributors to this file:
  *     Marc Olzheim, 2004
- *     Markus Armbruster, 2004-2012
+ *     Markus Armbruster, 2004-2013
  */
 
 /*
@@ -208,7 +208,7 @@ EMPCFBOTH("players_at_00", players_at_00, int, NSC_INT, 0,
     "Players have their coordinate system at deity 0,0 (0 - no, 1 - yes)")
 EMPCFBOTH("at_least_one_100", at_least_one_100, int, NSC_INT, KM_INTERNAL,
     "Initialize new countries with at least one sector with 100 of all resource")
-EMPCFBOTH("start_cash", start_cash, long, NSC_LONG, KM_INTERNAL,
+EMPCFBOTH("start_cash", start_cash, int, NSC_INT, KM_INTERNAL,
     "Starting cash for new countries")
 
 EMPCF_COMMENT("\n\n### Technology/Research/Education/Happiness")
diff --git a/include/loan.h b/include/loan.h
index fc5a01ce..ebed8ebb 100644
--- a/include/loan.h
+++ b/include/loan.h
@@ -52,8 +52,8 @@ struct lonstr {
     signed char l_status;	/* loan status */
     int l_irate;		/* interest rate */
     int l_ldur;			/* intended duration */
-    long l_amtpaid;		/* amount paid so far */
-    long l_amtdue;		/* amount still owed */
+    int l_amtpaid;		/* amount paid so far */
+    int l_amtdue;		/* amount still owed */
     time_t l_lastpay;		/* date of most recent payment */
     time_t l_duedate;		/* date after which interest doubles, etc */
 };
diff --git a/include/nat.h b/include/nat.h
index fc7f6aea..90336c4b 100644
--- a/include/nat.h
+++ b/include/nat.h
@@ -106,7 +106,7 @@ struct natstr {
     short nat_btu;		/* bureaucratic time units */
     short nat_access;		/* The tick when BTUs were last updated */
     int nat_reserve;		/* military reserves */
-    long nat_money;		/* moola */
+    int nat_money;		/* moola */
     time_t nat_last_login;	/* time of last login, 0 menas never */
     time_t nat_last_logout;	/* time of last logout, 0 means never */
     time_t nat_newstim;		/* date news last read */
diff --git a/include/prototypes.h b/include/prototypes.h
index 8d486666..0291f5e0 100644
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -728,7 +728,7 @@ extern void sail_ship(natid);
 extern void do_fallout(struct sctstr *, int);
 extern void spread_fallout(struct sctstr *, int);
 extern void decay_fallout(struct sctstr *, int);
-extern void produce_sect(int, int, struct bp *, long [][2]);
+extern void produce_sect(int, int, struct bp *, int[][2]);
 /* ship.c */
 extern int prod_ship(int, int, struct bp *, int);
 
diff --git a/include/trade.h b/include/trade.h
index 4b4012ed..3681eb58 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -50,7 +50,7 @@ struct trdstr {
     /* end of part matching struct empobj */
     short trd_type;
     int trd_unitid;
-    long trd_price;
+    int trd_price;
     int trd_maxbidder;
     time_t trd_markettime;
     coord trd_x;		/* destination for teleporting trade */
diff --git a/src/lib/commands/budg.c b/src/lib/commands/budg.c
index 3f1dd758..461a9122 100644
--- a/src/lib/commands/budg.c
+++ b/src/lib/commands/budg.c
@@ -42,7 +42,7 @@
 #include "optlist.h"
 #include "product.h"
 
-static void calc_all(long (*p_sect)[2], int *taxes, int *Ncivs,
+static void calc_all(int (*p_sect)[2], int *taxes, int *Ncivs,
 		     int *Nuws, int *bars, int *Nbars, int *mil,
 		     int *ships, int *sbuild, int *nsbuild, int *smaint,
 		     int *units, int *lbuild, int *nlbuild, int *lmaint,
@@ -53,7 +53,7 @@ int
 budg(void)
 {
     int i;
-    long p_sect[SCT_BUDG_MAX+1][2];
+    int p_sect[SCT_BUDG_MAX+1][2];
     int taxes, Ncivs, Nuws, bars, Nbars, mil;
     int ships, sbuild, nsbuild, smaint;
     int units, lbuild, nlbuild, lmaint;
@@ -84,12 +84,12 @@ budg(void)
 	    continue;
 	pr("%-17s\t\t", dchr[i].d_name);
 	if (i == SCT_ENLIST)
-	    pr("%ld mil    \t", p_sect[i][0]);
+	    pr("%d mil    \t", p_sect[i][0]);
 	else if (dchr[i].d_prd >= 0)
-	    pr("%ld %-7s\t", p_sect[i][0], pchr[dchr[i].d_prd].p_sname);
+	    pr("%d %-7s\t", p_sect[i][0], pchr[dchr[i].d_prd].p_sname);
 	else
 	    pr("\t\t");
-	pr("\t\t%8ld\n", p_sect[i][1]);
+	pr("\t\t%8d\n", p_sect[i][1]);
 	expenses += p_sect[i][1];
     }
 
@@ -129,16 +129,16 @@ budg(void)
     }
 
     if (p_sect[SCT_EFFIC][1]) {
-	sprintf(buf, "%ld sector%s",
+	sprintf(buf, "%d sector%s",
 		p_sect[SCT_EFFIC][0], splur(p_sect[SCT_EFFIC][0]));
-	pr("Sector building\t\t\t%-16s\t\t%8ld\n",
+	pr("Sector building\t\t\t%-16s\t\t%8d\n",
 	   buf, p_sect[SCT_EFFIC][1]);
 	expenses += p_sect[SCT_EFFIC][1];
     }
     if (p_sect[SCT_MAINT][0]) {
-	sprintf(buf, "%ld sector%s",
+	sprintf(buf, "%d sector%s",
 		p_sect[SCT_MAINT][0], splur(p_sect[SCT_MAINT][0]));
-	pr("Sector maintenance\t\t%-16s\t\t%8ld\n",
+	pr("Sector maintenance\t\t%-16s\t\t%8d\n",
 	   buf, p_sect[SCT_MAINT][1]);
 	expenses += p_sect[SCT_MAINT][1];
     }
@@ -159,7 +159,7 @@ budg(void)
 	pr("Income from bars\t\t%-32s%+8d\n", in, bars);
     }
     pr("Total income%s\n", dotsprintf(buf, "%+60d", income));
-    pr("Balance forward\t\t\t\t\t\t      %10ld\n", np->nat_money);
+    pr("Balance forward\t\t\t\t\t\t      %10d\n", np->nat_money);
     pr("Estimated delta\t\t\t\t\t\t      %+10d\n", income - expenses);
     pr("Estimated new treasury%s\n",
        dotsprintf(buf, "%50d", np->nat_money + income - expenses));
@@ -172,7 +172,7 @@ budg(void)
 }
 
 static void
-calc_all(long p_sect[][2],
+calc_all(int p_sect[][2],
 	 int *taxes, int *Ncivs, int *Nuws, int *bars, int *Nbars, int *mil,
 	 int *ships, int *sbuild, int *nsbuild, int *smaint,
 	 int *units, int *lbuild, int *nlbuild, int *lmaint,
diff --git a/src/lib/commands/coll.c b/src/lib/commands/coll.c
index 70810ee9..6c9cc575 100644
--- a/src/lib/commands/coll.c
+++ b/src/lib/commands/coll.c
@@ -136,9 +136,9 @@ coll(void)
     } else {
 	(void)time(&loan.l_lastpay);
 	owed -= pay;
-	loan.l_amtdue = (long)owed;
+	loan.l_amtdue = (int)owed;
 	pay += loan.l_amtpaid;
-	loan.l_amtpaid = pay;
+	loan.l_amtpaid = (int)pay;
 	wu(0, loan.l_lonee,
 	   "%s seized %s in partial payment of loan %d.\n",
 	   cname(player->cnum),
diff --git a/src/lib/commands/cons.c b/src/lib/commands/cons.c
index 712fee4c..27725ce3 100644
--- a/src/lib/commands/cons.c
+++ b/src/lib/commands/cons.c
@@ -222,7 +222,7 @@ loan_accept(struct ltcomstr *ltcp)
 	pr("%s no longer has the funds.\n", cname(ltcp->proposer));
 	if (lp->l_amtdue <= 0)
 	    return RET_FAIL;
-	pr("You may borrow $%ld at the same terms.\n", lp->l_amtdue);
+	pr("You may borrow $%d at the same terms.\n", lp->l_amtdue);
     }
     lender->nat_money -= lp->l_amtdue;
     putnat(lender);
@@ -236,7 +236,7 @@ loan_accept(struct ltcomstr *ltcp)
 	return RET_FAIL;
     }
     accpt(ltcp);
-    pr("You are now $%ld richer (sort of).\n", lp->l_amtdue);
+    pr("You are now $%d richer (sort of).\n", lp->l_amtdue);
     return RET_OK;
 }
 
diff --git a/src/lib/commands/edit.c b/src/lib/commands/edit.c
index 1801c19a..ff941085 100644
--- a/src/lib/commands/edit.c
+++ b/src/lib/commands/edit.c
@@ -31,7 +31,7 @@
  *     Chad Zabel, 1994
  *     Steve McClure, 1998-2000
  *     Ron Koenderink, 2003-2009
- *     Markus Armbruster, 2003-2011
+ *     Markus Armbruster, 2003-2013
  */
 
 #include <config.h>
@@ -302,7 +302,7 @@ prnat(struct natstr *np)
     pr("Research <R>: %.2f\n", np->nat_level[NAT_RLEV]);
     pr("Education <E>: %.2f\t\t", np->nat_level[NAT_ELEV]);
     pr("Happiness <H>: %.2f\n", np->nat_level[NAT_HLEV]);
-    pr("Money <M>: $%6ld\n", np->nat_money);
+    pr("Money <M>: $%6d\n", np->nat_money);
     pr("Telegrams <t>: %6d\n", np->nat_tgms);
     if (opt_HIDDEN) {
 	pr("Countries contacted: ");
@@ -709,9 +709,9 @@ docountry(char op, int arg, char *p, struct natstr *np)
 	np->nat_timeused = arg;
 	break;
     case 'M':
-	pr("Money changed from %ld to %d\n", np->nat_money, arg);
+	pr("Money changed from %d to %d\n", np->nat_money, arg);
 	wu(player->cnum, nat,
-	   "Money changed from %ld to %d by divine intervention.\n",
+	   "Money changed from %d to %d by divine intervention.\n",
 	   np->nat_money, arg);
 	np->nat_money = arg;
 	break;
diff --git a/src/lib/commands/fina.c b/src/lib/commands/fina.c
index 240fea71..45725dcc 100644
--- a/src/lib/commands/fina.c
+++ b/src/lib/commands/fina.c
@@ -66,7 +66,7 @@ fina(void)
 	pr(" %-2d  (%3d) %-8.8s  (%3d) %-8.8s  ", ni.cur,
 	   loan.l_loner, cname(loan.l_loner),
 	   loan.l_lonee, cname(loan.l_lonee));
-	pr("%3d%%   %3d    %5ld    %7.0f",
+	pr("%3d%%   %3d    %5d    %7.0f",
 	   loan.l_irate, loan.l_ldur, loan.l_amtpaid,
 	   ceil(loan_owed(&loan, now)));
 	if (now > loan.l_duedate)
diff --git a/src/lib/commands/hard.c b/src/lib/commands/hard.c
index 97885424..a8a9644f 100644
--- a/src/lib/commands/hard.c
+++ b/src/lib/commands/hard.c
@@ -51,7 +51,7 @@ hard(void)
     struct nstr_item ni;
     struct sctstr sect;
     char buf[1024];
-    long cash;
+    int cash;
     struct natstr *natp;
 
     if (!snxtitem(&ni, EF_PLANE, player->argp[1], NULL))
diff --git a/src/lib/commands/repa.c b/src/lib/commands/repa.c
index 0d40d0b9..e97addc3 100644
--- a/src/lib/commands/repa.c
+++ b/src/lib/commands/repa.c
@@ -46,7 +46,7 @@ repa(void)
     struct natstr *loaner;
     int loan_num;
     int payment;
-    long newdue;
+    int newdue;
     char *cp;
     time_t now;
     char buf[1024];
@@ -75,13 +75,13 @@ repa(void)
     if (payment <= 0)
 	return RET_SYN;
 
-    newdue = (long)ceil(loan_owed(&loan, time(&now)) - payment);
+    newdue = (int)ceil(loan_owed(&loan, time(&now)) - payment);
     if (newdue < 0) {
 	pr("You don't owe that much.\n");
 	return RET_FAIL;
     }
     if (natp->nat_money < payment) {
-	pr("You only have $%ld.\n", natp->nat_money);
+	pr("You only have $%d.\n", natp->nat_money);
 	return RET_FAIL;
     }
     player->dolcost += payment;
diff --git a/src/lib/commands/shark.c b/src/lib/commands/shark.c
index 29a52d14..11a796f1 100644
--- a/src/lib/commands/shark.c
+++ b/src/lib/commands/shark.c
@@ -48,7 +48,7 @@ shark(void)
     struct natstr *natp;
     struct natstr *oldie;
     double owed;
-    long payment;
+    int payment;
     char buf[1024];
 
     if (!opt_LOANS) {
@@ -78,7 +78,7 @@ shark(void)
     }
     pr("That loan is worth $%.2f.\n", owed);
     natp = getnatp(player->cnum);
-    payment = (long)ceil(owed * (1.0 + loan.l_irate / 100.0));
+    payment = (int)ceil(owed * (1.0 + loan.l_irate / 100.0));
     if (payment > natp->nat_money - 100.0) {
 	pr("You do not have enough to cover that loan\n");
 	return RET_FAIL;
@@ -87,7 +87,7 @@ shark(void)
 	   "%s bought loan #%d.  You now owe him!\n",
 	   cname(player->cnum), arg);
 	wu(0, loan.l_loner,
-	   "%s bought loan #%d out from under you for %ld\n",
+	   "%s bought loan #%d out from under you for %d\n",
 	   cname(player->cnum), arg, payment);
 	pr("You now own loan #%d.  Go break some legs.\n", arg);
     }
diff --git a/src/lib/commands/trad.c b/src/lib/commands/trad.c
index ed587962..a53da4d1 100644
--- a/src/lib/commands/trad.c
+++ b/src/lib/commands/trad.c
@@ -30,6 +30,7 @@
  *     Dave Pare, 1986
  *     Pat Loney, 1992
  *     Steve McClure, 1996-2000
+ *     Markus Armbruster, 2004-2013
  */
 
 #include <config.h>
@@ -102,7 +103,7 @@ trad(void)
 	    TRADE_DELAY / 3600.0 - (now - trade.trd_markettime) / 3600.0;
 	if (tleft < 0.0)
 	    tleft = 0.0;
-	pr("$%7ld  %2d %5.2f hrs ",
+	pr("$%7d  %2d %5.2f hrs ",
 	   trade.trd_price, trade.trd_maxbidder, tleft);
 	trade_desc(&tg.gen);	/* XXX */
 	pr("\n");
diff --git a/src/lib/commands/upgr.c b/src/lib/commands/upgr.c
index 161525ff..7f4aedbf 100644
--- a/src/lib/commands/upgr.c
+++ b/src/lib/commands/upgr.c
@@ -83,7 +83,7 @@ lupgr(void)
     int n;
     int tlev;
     int avail, cost;
-    long cash;
+    int cash;
 
     if (!snxtitem(&ni, EF_LAND, player->argp[2], NULL))
 	return RET_SYN;
@@ -163,7 +163,7 @@ supgr(void)
     int n;
     int tlev;
     int avail, cost;
-    long cash;
+    int cash;
 
     if (!snxtitem(&ni, EF_SHIP, player->argp[2], NULL))
 	return RET_SYN;
@@ -242,7 +242,7 @@ pupgr(void)
     int n;
     int tlev;
     int avail, cost;
-    long cash;
+    int cash;
 
     if (!snxtitem(&ni, EF_PLANE, player->argp[2], NULL))
 	return RET_SYN;
diff --git a/src/lib/common/nsc.c b/src/lib/common/nsc.c
index 643d688d..bc50dcb1 100644
--- a/src/lib/common/nsc.c
+++ b/src/lib/common/nsc.c
@@ -460,8 +460,8 @@ struct castr loan_ca[] = {
      EF_AGREEMENT_STATUS, 0},
     {"irate", fldoff(l_irate), NSC_INT, 0, NULL, EF_BAD, 0},
     {"ldur", fldoff(l_ldur), NSC_INT, 0, NULL, EF_BAD, 0},
-    {"amtpaid", fldoff(l_amtpaid), NSC_LONG, 0, NULL, EF_BAD, 0},
-    {"amtdue", fldoff(l_amtdue), NSC_LONG, 0, NULL, EF_BAD, 0},
+    {"amtpaid", fldoff(l_amtpaid), NSC_INT, 0, NULL, EF_BAD, 0},
+    {"amtdue", fldoff(l_amtdue), NSC_INT, 0, NULL, EF_BAD, 0},
     {"lastpay", fldoff(l_lastpay), NSC_TIME, 0, NULL, EF_BAD, 0},
     {"duedate", fldoff(l_duedate), NSC_TIME, 0, NULL, EF_BAD, 0},
     {NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0}
@@ -526,7 +526,7 @@ struct castr trade_ca[] = {
     {"type", fldoff(trd_type), NSC_CHAR, 0, NULL, EF_TABLE, 0},
     /* unitid's ca_table given by type, but can't express that: */
     {"unitid", fldoff(trd_unitid), NSC_INT, 0, NULL, EF_BAD, 0},
-    {"price", fldoff(trd_price), NSC_LONG, 0, NULL, EF_BAD, 0},
+    {"price", fldoff(trd_price), NSC_INT, 0, NULL, EF_BAD, 0},
     {"maxbidder", fldoff(trd_maxbidder), NSC_INT, 0, NULL, EF_NATION, 0},
     {"markettime", fldoff(trd_markettime), NSC_TIME, 0, NULL, EF_BAD, 0},
     /* should let maxbidder access xloc, yloc, but can't express that: */
@@ -575,7 +575,7 @@ struct castr cou_ca[] = {
     {"btu", fldoff(nat_btu), NSC_SHORT, 0, NULL, EF_BAD, 0},
     {"access", fldoff(nat_access), NSC_SHORT, 0, NULL, EF_BAD, 0},
     {"milreserve", fldoff(nat_reserve), NSC_INT, 0, NULL, EF_BAD, 0},
-    {"money", fldoff(nat_money), NSC_LONG, 0, NULL, EF_BAD, 0},
+    {"money", fldoff(nat_money), NSC_INT, 0, NULL, EF_BAD, 0},
     {"login", fldoff(nat_last_login), NSC_TIME, 0, NULL, EF_BAD, 0},
     {"logout", fldoff(nat_last_logout), NSC_TIME, 0, NULL, EF_BAD, 0},
     {"newstim", fldoff(nat_newstim), NSC_TIME, 0, NULL, EF_BAD, 0},
diff --git a/src/lib/global/constants.c b/src/lib/global/constants.c
index f818a9ac..c7cbb431 100644
--- a/src/lib/global/constants.c
+++ b/src/lib/global/constants.c
@@ -29,7 +29,7 @@
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  *     Steve McClure, 1996
- *     Markus Armbruster, 2004-2012
+ *     Markus Armbruster, 2004-2013
  */
 
 #include <config.h>
@@ -209,7 +209,7 @@ float trade_ally_cut = 0.10;	/* 10% bonus for ally you trade with */
 
 int torpedo_damage = 40;	/* damage is X + 1dX + 1dX, so 40+1d40+1d40 */
 
-long start_cash = 25000;
+int start_cash = 25000;
 
 /* initial levels */
 float start_education = 0.0;
diff --git a/src/lib/subs/caploss.c b/src/lib/subs/caploss.c
index 53d1568d..1bcb6e71 100644
--- a/src/lib/subs/caploss.c
+++ b/src/lib/subs/caploss.c
@@ -28,7 +28,7 @@
  *
  *  Known contributors to this file:
  *     Steve McClure, 2000
- *     Markus Armbruster, 2007-2008
+ *     Markus Armbruster, 2007-2013
  */
 
 #include <config.h>
@@ -49,8 +49,7 @@ caploss(struct sctstr *sp, natid coun, char *msg)
     struct natstr *natp;
     struct lonstr loan;
     struct comstr comm;
-    long lose;
-    long gain;
+    int lose, gain;
     char *verb;
     int loan_num, comm_num;
 
@@ -81,9 +80,9 @@ caploss(struct sctstr *sp, natid coun, char *msg)
     verb = sp->sct_own ? "sacked" : "obliterated";
     wu(0, coun, "* %s just %s your capital! *\n",
        cname(player->cnum), verb);
-    wu(0, coun, "You lost $%ld and they gained $%ld\n", lose, gain);
+    wu(0, coun, "You lost $%d and they gained $%d\n", lose, gain);
     wu(0, coun, "You need to use 'capital' to activate a new capital.\n");
-    wu(0, 0, "%s just %s %s's capital and gained $%ld\n",
+    wu(0, 0, "%s just %s %s's capital and gained $%d\n",
        cname(player->cnum), verb, cname(coun), gain);
 
     if (opt_LOANS && sp->sct_own) {
diff --git a/src/lib/subs/disloan.c b/src/lib/subs/disloan.c
index 050c083c..524487cf 100644
--- a/src/lib/subs/disloan.c
+++ b/src/lib/subs/disloan.c
@@ -67,7 +67,7 @@ disloan(int n, struct lonstr *loan)
     pr("\nLoan #%d from %s to", n, cname(loan->l_loner));
     pr(" %s\n", cname(loan->l_lonee));
     if (loan->l_status == LS_PROPOSED) {
-	pr("(proposed) principal=$%ld interest rate=%d%%",
+	pr("(proposed) principal=$%d interest rate=%d%%",
 	   loan->l_amtdue, loan->l_irate);
 	pr(" duration(days)=%d\n", loan->l_ldur);
 	if (loan->l_duedate < now) {
@@ -81,7 +81,7 @@ disloan(int n, struct lonstr *loan)
 	return 1;
     }
 
-    pr("Amount paid to date $%ld\n", loan->l_amtpaid);
+    pr("Amount paid to date $%d\n", loan->l_amtpaid);
     pr("Amount due (if paid now) $%.2f", loan_owed(loan, now));
     if (now <= loan->l_duedate) {
 	pr(" (if paid on due date) $%.2f\n",
diff --git a/src/lib/update/main.c b/src/lib/update/main.c
index 7f1d026f..1de77666 100644
--- a/src/lib/update/main.c
+++ b/src/lib/update/main.c
@@ -44,11 +44,11 @@
 #include "unit.h"
 #include "update.h"
 
-long money[MAXNOC];
+int money[MAXNOC];
 int pops[MAXNOC];
-long sea_money[MAXNOC];
-long lnd_money[MAXNOC];
-long air_money[MAXNOC];
+int sea_money[MAXNOC];
+int lnd_money[MAXNOC];
+int air_money[MAXNOC];
 int tpops[MAXNOC];
 
 void
@@ -103,7 +103,7 @@ update_main(void)
     logerror("done preparing sectors.");
     logerror("producing for countries...");
     for (i = 0; i < MAXNOC; i++) {
-	long p_sect[SCT_BUDG_MAX+1][2];
+	int p_sect[SCT_BUDG_MAX+1][2];
 
 	memset(p_sect, 0, sizeof(p_sect));
 	if (!(np = getnatp(i)))
diff --git a/src/lib/update/nat.c b/src/lib/update/nat.c
index e735db3f..dff485d5 100644
--- a/src/lib/update/nat.c
+++ b/src/lib/update/nat.c
@@ -203,9 +203,9 @@ prod_nat(int etu)
 	if ((sea_money[n] != 0) || (air_money[n] != 0) ||
 	    (lnd_money[n] != 0))
 	    wu(0, n,
-	       "Army delta $%ld, Navy delta $%ld, Air force delta $%ld\n",
+	       "Army delta $%d, Navy delta $%d, Air force delta $%d\n",
 	       lnd_money[n], sea_money[n], air_money[n]);
-	wu(0, n, "money delta was $%ld for this update\n",
+	wu(0, n, "money delta was $%d for this update\n",
 	   np->nat_money - money[n]);
 	if (opt_LOSE_CONTACT) {
 	    for (cn = 1; cn < MAXNOC; cn++) {
diff --git a/src/lib/update/sect.c b/src/lib/update/sect.c
index 0bf31bf7..d36aa255 100644
--- a/src/lib/update/sect.c
+++ b/src/lib/update/sect.c
@@ -29,7 +29,7 @@
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Steve McClure, 1996
- *     Markus Armbruster, 2004-2010
+ *     Markus Armbruster, 2004-2013
  */
 
 #include <config.h>
@@ -257,7 +257,7 @@ decay_fallout(struct sctstr *sp, int etus)
  * Produce for a specific nation
  */
 void
-produce_sect(int natnum, int etu, struct bp *bp, long p_sect[][2])
+produce_sect(int natnum, int etu, struct bp *bp, int p_sect[][2])
 {
     struct sctstr *sp;
     struct natstr *np;
diff --git a/tests/smoke/smoke.out b/tests/smoke/smoke.out
index 835d4b6b..6cc169fa 100644
--- a/tests/smoke/smoke.out
+++ b/tests/smoke/smoke.out
@@ -242,7 +242,7 @@ Player 00 Turn 00 starting
 "owner" 5 0 0 9
 "type" 4 0 0 27
 "unitid" 8 0 0 -1
-"price" 1 0 0 -1
+"price" 8 0 0 -1
 "maxbidder" 8 0 0 9
 "markettime" 12 0 0 -1
 "xloc" 9 1 0 -1
@@ -269,7 +269,7 @@ Player 00 Turn 00 starting
 "btu" 6 1 0 -1
 "access" 6 1 0 -1
 "milreserve" 8 1 0 -1
-"money" 1 1 0 -1
+"money" 8 1 0 -1
 "login" 12 1 0 -1
 "logout" 12 1 0 -1
 "newstim" 12 1 0 -1
@@ -290,8 +290,8 @@ Player 00 Turn 00 starting
 "status" 4 0 0 30
 "irate" 8 0 0 -1
 "ldur" 8 0 0 -1
-"amtpaid" 1 0 0 -1
-"amtdue" 1 0 0 -1
+"amtpaid" 8 0 0 -1
+"amtdue" 8 0 0 -1
 "lastpay" 12 0 0 -1
 "duedate" 12 0 0 -1
 /10
@@ -758,7 +758,7 @@ Player 00 Turn 00 starting
 "btu" 6 0 0 -1
 "access" 6 0 0 -1
 "milreserve" 8 0 0 -1
-"money" 1 0 0 -1
+"money" 8 0 0 -1
 "login" 12 0 0 -1
 "logout" 12 0 0 -1
 "newstim" 12 0 0 -1
@@ -1163,7 +1163,7 @@ CENSUS                   del dst
 "owner" 5 0 0 9
 "type" 4 0 0 27
 "unitid" 8 0 0 -1
-"price" 1 0 0 -1
+"price" 8 0 0 -1
 "maxbidder" 8 0 0 9
 "markettime" 12 0 0 -1
 /7
@@ -1183,8 +1183,8 @@ CENSUS                   del dst
 "status" 4 0 0 30
 "irate" 8 0 0 -1
 "ldur" 8 0 0 -1
-"amtpaid" 1 0 0 -1
-"amtdue" 1 0 0 -1
+"amtpaid" 8 0 0 -1
+"amtdue" 8 0 0 -1
 "lastpay" 12 0 0 -1
 "duedate" 12 0 0 -1
 /10
@@ -1645,7 +1645,7 @@ CENSUS                   del dst
 "btu" 6 0 0 -1
 "access" 6 0 0 -1
 "milreserve" 8 0 0 -1
-"money" 1 0 0 -1
+"money" 8 0 0 -1
 "login" 12 0 0 -1
 "logout" 12 0 0 -1
 "newstim" 12 0 0 -1