5 files changed, 11 insertions, 4 deletions
diff --git a/src/gui/widgets/tabs/setup_players.cpp b/src/gui/widgets/tabs/setup_players.cpp
index de69bf747..31ede16f0 100644
--- a/src/gui/widgets/tabs/setup_players.cpp
+++ b/src/gui/widgets/tabs/setup_players.cpp
@@ -179,7 +179,7 @@ Setup_Players::Setup_Players(const Widget2 *const widget) :
         MainConfig_true);
 
     // TRANSLATORS: settings option
-    new SetupItemCheckBox(_("Use special diagonal speed in players moving"),
+    new SetupItemCheckBox(_("Correct diagonal speed in players moving"),
         "", "useDiagonalSpeed", this, "useDiagonalSpeedEvent",
         MainConfig_true);
 
diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp
index 15a536f15..79e6cb47c 100644
--- a/src/gui/windowmanager.cpp
+++ b/src/gui/windowmanager.cpp
@@ -449,11 +449,19 @@ void WindowManager::setIcon()
     if (icon)
     {
 #ifdef WIN64
+#ifdef USE_SDL2
+        SetClassLongPtr(pInfo.info.win.window,
+#else
         SetClassLongPtr(pInfo.window,
+#endif  // USE_SDL2
             GCLP_HICON,
             reinterpret_cast<LONG_PTR>(icon));
 #else  // WIN64
+#ifdef USE_SDL2
+        SetClassLong(pInfo.info.win.window,
+#else
         SetClassLong(pInfo.window,
+#endif  // USE_SDL2
             GCL_HICON,
             reinterpret_cast<LONG>(icon));
 #endif  // WIN64
diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp
index 31cd5a656..1fb54e010 100644
--- a/src/gui/windows/editserverdialog.cpp
+++ b/src/gui/windows/editserverdialog.cpp
@@ -95,7 +95,7 @@ EditServerDialog::EditServerDialog(ServerDialog *const parent,
     mPortField->setNumeric(true);
     mPortField->setRange(1, 65535);
 
-    mTypeField->setSelected(0);  // TmwAthena by default
+    mTypeField->setSelected(0);  // FIXME: Currently, TmwAthena by default
 
     mServerAddressField->addActionListener(this);
     mPortField->addActionListener(this);
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 90f552383..15773e3d4 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -247,7 +247,7 @@ UpdaterWindow::UpdaterWindow(const std::string &restrict updateHost,
         const STD_VECTOR<std::string> &mirrors = settings.updateMirrors;
         if (mirrors.begin() != mirrors.end())
             mUpdateHost = *mirrors.begin();
-        mSkipPatches = true;
+        mSkipPatches = false;
     }
 
     loadWindowState();
diff --git a/src/gui/windows/worldselectdialog.cpp b/src/gui/windows/worldselectdialog.cpp
index ecfcbfc94..36cd57e07 100644
--- a/src/gui/windows/worldselectdialog.cpp
+++ b/src/gui/windows/worldselectdialog.cpp
@@ -146,7 +146,6 @@ void WorldSelectDialog::keyPressed(KeyEvent &event)
     if (actionId == InputAction::GUI_DOWN)
     {
         event.consume();
-
         mWorldList->setSelected(mWorldList->getSelected() + 1);
     }
 }