diff --git a/config.lib b/config.lib
index e3fa8578cc..57a02a1894 100644
--- a/config.lib
+++ b/config.lib
@@ -2311,6 +2311,13 @@ detect_library() {
 				log 2 "  trying /usr/pkg/include/$4$5... no"
 			fi
 		fi
+		if [ -z "$res" ] && [ "$os" = "HAIKU" ]; then
+			eval "$2=`ls -1 /boot/common/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
+			eval "res=\$$2"
+			if [ -z "$res" ]; then
+				log 2 "  trying /boot/common/include/$4$5... no"
+			fi
+		fi
 
 		eval "res=\$$2"
 		if [ -n "$res" ] && ( [ -n "$force_static" ] || ( [ "$enable_static" != "0" ] && [ "$os" != "OSX" ] ) ); then
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp
index 2f952b4aa4..356be3eff3 100644
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -59,7 +59,7 @@ enum BuildVehicleWidgets {
 static const NWidgetPart _nested_build_vehicle_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_GREY),
-		NWidget(WWT_CAPTION, COLOUR_GREY, BUILD_VEHICLE_WIDGET_CAPTION), SetDataTip(STR_JUST_STRING, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+		NWidget(WWT_CAPTION, COLOUR_GREY, BUILD_VEHICLE_WIDGET_CAPTION), SetDataTip(STR_WHITE_STRING, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 		NWidget(WWT_SHADEBOX, COLOUR_GREY),
 		NWidget(WWT_STICKYBOX, COLOUR_GREY),
 	EndContainer(),
diff --git a/src/elrail.cpp b/src/elrail.cpp
index e668e66127..108dc419cf 100644
--- a/src/elrail.cpp
+++ b/src/elrail.cpp
@@ -601,8 +601,7 @@ bool SettingsDisableElrail(int32 p1)
 	FOR_ALL_TRAINS(t) {
 		/* power and acceleration is cached only for front engines */
 		if (t->IsFrontEngine()) {
-			t->PowerChanged();
-			t->UpdateAcceleration();
+			t->ConsistChanged(true);
 		}
 	}
 
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index 1021deb77e..57606de5ee 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -1396,6 +1396,10 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 					break;
 				case MP_ROAD:
 					if (!IsLevelCrossing(tile)) continue;
+					if (RailNoLevelCrossings(totype)) {
+						_error_message = STR_ERROR_CROSSING_DISALLOWED;
+						continue;
+					}
 					break;
 				case MP_TUNNELBRIDGE:
 					if (GetTunnelBridgeTransportType(tile) != TRANSPORT_RAIL) continue;
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index ce9c284b01..a454cc38df 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -642,7 +642,6 @@ struct BuildRailToolbarWindow : Window {
 		const RailtypeInfo *rti = GetRailTypeInfo(railtype);
 
 		assert(railtype < RAILTYPE_END);
-		this->GetWidget<NWidgetCore>(RTW_CAPTION)->widget_data      = rti->max_speed > 0 ? STR_TOOLBAR_RAILTYPE_VELOCITY : STR_JUST_STRING;
 		this->GetWidget<NWidgetCore>(RTW_BUILD_NS)->widget_data     = rti->gui_sprites.build_ns_rail;
 		this->GetWidget<NWidgetCore>(RTW_BUILD_X)->widget_data      = rti->gui_sprites.build_x_rail;
 		this->GetWidget<NWidgetCore>(RTW_BUILD_EW)->widget_data     = rti->gui_sprites.build_ew_rail;
@@ -696,8 +695,13 @@ struct BuildRailToolbarWindow : Window {
 	{
 		if (widget == RTW_CAPTION) {
 			const RailtypeInfo *rti = GetRailTypeInfo(this->railtype);
-			SetDParam(0, rti->strings.toolbar_caption);
-			SetDParam(1, rti->max_speed);
+			if (rti->max_speed > 0) {
+				SetDParam(0, STR_TOOLBAR_RAILTYPE_VELOCITY);
+				SetDParam(1, rti->strings.toolbar_caption);
+				SetDParam(2, rti->max_speed);
+			} else {
+				SetDParam(0, rti->strings.toolbar_caption);
+			}
 		}
 	}
 
@@ -829,7 +833,7 @@ struct BuildRailToolbarWindow : Window {
 static const NWidgetPart _nested_build_rail_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_DARK_GREEN),
-		NWidget(WWT_CAPTION, COLOUR_DARK_GREEN, RTW_CAPTION), SetDataTip(STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+		NWidget(WWT_CAPTION, COLOUR_DARK_GREEN, RTW_CAPTION), SetDataTip(STR_WHITE_STRING, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 		NWidget(WWT_STICKYBOX, COLOUR_DARK_GREEN),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),