diff --git a/src/gui/DialogContainer.hxx b/src/gui/DialogContainer.hxx
index ee97cddf4..850859454 100644
--- a/src/gui/DialogContainer.hxx
+++ b/src/gui/DialogContainer.hxx
@@ -106,7 +106,7 @@ class DialogContainer
 
       @param stick  The joystick number
       @param axis   The joystick axis
-      @param value  Value associated with given axis
+      @param adir   Value associated with given axis
     */
     void handleJoyAxisEvent(int stick, JoyAxis axis, JoyDir adir, int button);
 
@@ -115,7 +115,7 @@ class DialogContainer
 
       @param stick  The joystick number
       @param hat    The joystick hat
-      @param hdir   Direction of the with given hat
+      @param hdir   Direction of the given hat
     */
     void handleJoyHatEvent(int stick, int hat, JoyHatDir hdir, int button);
 
diff --git a/src/gui/EventMappingWidget.cxx b/src/gui/EventMappingWidget.cxx
index 49d3241a2..603eadcd0 100644
--- a/src/gui/EventMappingWidget.cxx
+++ b/src/gui/EventMappingWidget.cxx
@@ -44,9 +44,9 @@ EventMappingWidget::EventMappingWidget(GuiObject* boss, const GUI::Font& font,
     myActionSelected(-1),
     myRemapStatus(false),
     myLastStick(0),
+    myLastHat(0),
     myLastAxis(JoyAxis::NONE),
     myLastDir(JoyDir::NONE),
-    myLastHat(0),
     myLastHatDir(JoyHatDir::CENTER),
     myLastButton(JOY_CTRL_NONE),
     myFirstTime(true)