diff --git a/aircraft_cmd.c b/aircraft_cmd.c
index d37b18e172..147f7e8616 100644
--- a/aircraft_cmd.c
+++ b/aircraft_cmd.c
@@ -912,7 +912,7 @@ static bool AircraftController(Vehicle *v)
 	dist = myabs(x + amd->x - v->x_pos) +  myabs(y + amd->y - v->y_pos);
 
 	// Need exact position?
-	if (!(amd->flag & AMED_EXACTPOS) && dist <= (amd->flag & AMED_SLOWTURN ? 8 : 4))
+	if (!(amd->flag & AMED_EXACTPOS) && dist <= (amd->flag & AMED_SLOWTURN ? 8U : 4U))
 		return true;
 
 	// At final pos?
diff --git a/rail_cmd.c b/rail_cmd.c
index d8ce3e0017..941b3141cb 100644
--- a/rail_cmd.c
+++ b/rail_cmd.c
@@ -288,7 +288,7 @@ int32 CmdBuildSingleRail(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 	switch (GetTileType(tile)) {
 		case MP_TUNNELBRIDGE:
 			if ((m5 & 0xC0) != 0xC0 || // not bridge middle part?
-					(m5 & 0x01 ? 1 : 2) != trackbit) { // wrong direction?
+					(m5 & 0x01 ? TRACK_BIT_DIAG1 : TRACK_BIT_DIAG2) != trackbit) { // wrong direction?
 				// Get detailed error message
 				return DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
 			}
@@ -444,7 +444,7 @@ int32 CmdRemoveSingleRail(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 			if ((_m[tile].m5 & 0xF8) != 0xE0)
 				return CMD_ERROR;
 
-			if ( ((_m[tile].m5 & 1) ? 1 : 2) != trackbit )
+			if ((_m[tile].m5 & 1 ? TRACK_BIT_DIAG1 : TRACK_BIT_DIAG2) != trackbit)
 				return CMD_ERROR;
 
 			if (!(flags & DC_EXEC))