diff --git a/src/hotkeys.cpp b/src/hotkeys.cpp
index 373cc1c58f..de95d15187 100644
--- a/src/hotkeys.cpp
+++ b/src/hotkeys.cpp
@@ -48,8 +48,7 @@ static const KeycodeNames _keycode_to_name[] = {
 	{"F11", WKC_F11},
 	{"F12", WKC_F12},
 	{"PAUSE", WKC_PAUSE},
-	{"PLUS", (WindowKeyCodes)'+'},
-	{"COMMA", (WindowKeyCodes)','},
+	{"COMMA", WKC_COMMA},
 	{"NUM_PLUS", WKC_NUM_PLUS},
 	{"NUM_MINUS", WKC_NUM_MINUS},
 	{"=", WKC_EQUALS},
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index 5775241546..4b72f5a7ae 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -843,8 +843,6 @@ static CommandCost CmdRailTrackHelper(TileIndex tile, DoCommandFlag flags, uint3
 	CommandCost ret = ValidateAutoDrag(&trackdir, tile, end_tile);
 	if (ret.Failed()) return ret;
 
-	if ((flags & DC_EXEC) && _settings_client.sound.confirm) SndPlayTileFx(SND_20_SPLAT_2, tile);
-
 	bool had_success = false;
 	CommandCost last_error = CMD_ERROR;
 	for (;;) {
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index 54c028dc0e..0faa70c078 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -351,7 +351,8 @@ static void DoRailroadTrack(int mode)
 	DoCommandP(TileVirtXY(_thd.selstart.x, _thd.selstart.y), TileVirtXY(_thd.selend.x, _thd.selend.y), _cur_railtype | (mode << 4),
 			_remove_button_clicked ?
 			CMD_REMOVE_RAILROAD_TRACK | CMD_MSG(STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK) :
-			CMD_BUILD_RAILROAD_TRACK  | CMD_MSG(STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK));
+			CMD_BUILD_RAILROAD_TRACK  | CMD_MSG(STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK),
+			CcPlaySound1E);
 }
 
 static void HandleAutodirPlacement()
diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp
index a95e863320..ba0b076402 100644
--- a/src/video/sdl_v.cpp
+++ b/src/video/sdl_v.cpp
@@ -837,7 +837,7 @@ bool VideoDriver_SDL::ToggleFullscreen(bool fullscreen)
 
 bool VideoDriver_SDL::AfterBlitterChange()
 {
-	return this->ChangeResolution(_screen.width, _screen.height);
+	return CreateMainSurface(_screen.width, _screen.height);
 }
 
 #endif /* WITH_SDL */