--- a/graph_gui.c	Tue Jul 19 22:12:04 2005 +0000
+++ b/graph_gui.c	Tue Jul 19 22:29:35 2005 +0000
@@ -1150,7 +1150,6 @@
 {
 	switch (e->event) {
 	case WE_PAINT: {
-		uint32 i;
 		int y = 16; // offset from top of widget
 
 		if (_sign_sort_dirty)
@@ -1167,8 +1166,8 @@
 			return;
 		}
 
-		{
-			SignStruct *ss;
+		{	const SignStruct *ss;
+			uint16 i;
 
 			/* Start drawing the signs */
 			for (i = w->vscroll.pos; i < w->vscroll.cap + w->vscroll.pos && i < w->vscroll.count; i++) {

--- a/train_cmd.c	Tue Jul 19 22:12:04 2005 +0000
+++ b/train_cmd.c	Tue Jul 19 22:29:35 2005 +0000
@@ -47,7 +47,7 @@
 		vweight += rvi->weight;
 		vweight += (_cargoc.weights[u->cargo_type] * u->cargo_count) / 16;
 		// powered wagons have extra weight added
-		if HASBIT(u->u.rail.flags, VRF_POWEREDWAGON)
+		if (HASBIT(u->u.rail.flags, VRF_POWEREDWAGON))
 			vweight += RailVehInfo(v->engine_type)->pow_wag_weight;
 
 		// consist weight is the sum of the weight of all vehicles in the consist