diff --git a/src/script/api/script_list.cpp b/src/script/api/script_list.cpp
--- a/src/script/api/script_list.cpp
+++ b/src/script/api/script_list.cpp
@@ -520,9 +520,7 @@ void ScriptList::Sort(SorterType sorter,
 			}
 			break;
 
-		default:
-			this->Sort(SORT_BY_ITEM, false);
-			return;
+		default: NOT_REACHED();
 	}
 	this->sorter_type    = sorter;
 	this->sort_ascending = ascending;
@@ -641,6 +639,7 @@ void ScriptList::RemoveBottom(int32 coun
 					if (--size == 0) break;
 				}
 			}
+			break;
 
 		case SORT_BY_ITEM:
 			for (ScriptListMap::reverse_iterator iter = this->items.rbegin(); iter != this->items.rend(); iter = this->items.rbegin()) {
diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp
--- a/src/tunnelbridge_cmd.cpp
+++ b/src/tunnelbridge_cmd.cpp
@@ -680,7 +680,7 @@ CommandCost CmdBuildTunnel(TileIndex sta
 	switch (transport_type) {
 		case TRANSPORT_ROAD: cost.AddCost((tiles + 2) * _price[PR_BUILD_ROAD] * 2); break;
 		case TRANSPORT_RAIL: cost.AddCost((tiles + 2) * RailBuildCost(railtype)); break;
-		default: break;
+		default: NOT_REACHED();
 	}
 
 	if (flags & DC_EXEC) {