diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
index 5a7b356d4a..b7220d22ed 100644
--- a/src/road_cmd.cpp
+++ b/src/road_cmd.cpp
@@ -250,7 +250,7 @@ static CommandCost RemoveRoad(TileIndex tile, DoCommandFlag flags, RoadBits piec
 					other_end_pieces |= other_end_existing;
 				}
 				pieces_count += middle_len * 2;
-				if ((GetCustomBridgeHeadRoadBits(tile, other_rt) & entrance_piece) == ROAD_NONE) {
+				if (custom_bridge_head && ((GetCustomBridgeHeadRoadBits(tile, other_rt) & entrance_piece) == ROAD_NONE)) {
 					/* can't leave no entrance pieces for any road type */
 					return DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
 				}
diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp
index f4c690a9d1..6cd8c04367 100644
--- a/src/tunnelbridge_cmd.cpp
+++ b/src/tunnelbridge_cmd.cpp
@@ -1879,7 +1879,7 @@ static TrackStatus GetTileTrackStatus_TunnelBridge(TileIndex tile, TransportType
 static void UpdateRoadTunnelBridgeInfrastructure(TileIndex begin, TileIndex end, bool add) {
 	/* A full diagonal road has two road bits. */
 	const uint middle_len = 2 * GetTunnelBridgeLength(begin, end) * TUNNELBRIDGE_TRACKBIT_FACTOR;
-	const uint len = middle_len + (2 * TUNNELBRIDGE_TRACKBIT_FACTOR);
+	const uint len = middle_len + (4 * TUNNELBRIDGE_TRACKBIT_FACTOR);
 
 	/* Iterate all present road types as each can have a different owner. */
 	RoadType rt;