diff --git a/newgrf.c b/newgrf.c
index 0d0ed95cd4..4d44dd6b3e 100644
--- a/newgrf.c
+++ b/newgrf.c
@@ -2392,13 +2392,12 @@ static void ReleaseSpriteGroups(GRFFile *file)
 static void ResetCustomStations(void)
 {
 	GRFFile *file;
-	int i;
+	uint i;
 	CargoID c;
 
 	for (file = _first_grffile; file != NULL; file = file->next) {
-		for (i = 0; i < 256; i++) {
-			if (file->stations[i].grfid != file->grfid)
-				continue;
+		for (i = 0; i < lengthof(file->stations); i++) {
+			if (file->stations[i].grfid != file->grfid) continue;
 
 			// TODO: Release renderdata, platforms and layouts
 
diff --git a/rail_gui.c b/rail_gui.c
index 668e797ff7..e105c6679f 100644
--- a/rail_gui.c
+++ b/rail_gui.c
@@ -833,9 +833,10 @@ static void BuildWaypointWndProc(Window *w, WindowEvent *e)
 		w->click_state = (1 << 3) << (_cur_waypoint_type - w->hscroll.pos);
 		DrawWindowWidgets(w);
 
-		for (i = 0; i < 5; i++)
-			if(w->hscroll.pos + i < _waypoint_count)
+		for (i = 0; i < 5; i++) {
+			if (w->hscroll.pos + i < _waypoint_count)
 				DrawWaypointSprite(2 + i * 68, 25, w->hscroll.pos + i, _cur_railtype);
+		}
 
 		break;
 	}