diff --git a/modules/corelib/keyboard.lua b/modules/corelib/keyboard.lua
index dbad3ba2..9485535d 100644
--- a/modules/corelib/keyboard.lua
+++ b/modules/corelib/keyboard.lua
@@ -157,14 +157,14 @@ function g_keyboard.unbindKeyDown(keyComboDesc, arg1, arg2)
   disconnect(widget.boundKeyDownCombos, keyComboDesc, callback)
 end
 
-function g_keyboard.unbindKeyUp(keyComboDesc, widget)
+function g_keyboard.unbindKeyUp(keyComboDesc, arg1, arg2)
   local callback, widget = getUnbindArgs(arg1, arg2)
   if widget.boundKeyUpCombos == nil then return end
   local keyComboDesc = retranslateKeyComboDesc(keyComboDesc)
   disconnect(widget.boundKeyUpCombos, keyComboDesc, callback)
 end
 
-function g_keyboard.unbindKeyPress(keyComboDesc, widget, callback)
+function g_keyboard.unbindKeyPress(keyComboDesc, arg1, arg2)
   local callback, widget = getUnbindArgs(arg1, arg2)
   if widget.boundKeyPressCombos == nil then return end
   local keyComboDesc = retranslateKeyComboDesc(keyComboDesc)
diff --git a/modules/game_interface/gameinterface.lua b/modules/game_interface/gameinterface.lua
index 197b2dbd..7c9fccd4 100644
--- a/modules/game_interface/gameinterface.lua
+++ b/modules/game_interface/gameinterface.lua
@@ -89,8 +89,8 @@ function bindKeys()
 end
 
 function bindWalkKey(key, dir)
-  g_keyboard.bindKeyDown(key, function() changeWalkDir(dir) end, gameRootPanel)
-  g_keyboard.bindKeyUp(key, function() changeWalkDir(dir, true) end, gameRootPanel)
+  g_keyboard.bindKeyDown(key, function() changeWalkDir(dir) end, gameRootPanel, true)
+  g_keyboard.bindKeyUp(key, function() changeWalkDir(dir, true) end, gameRootPanel, true)
   g_keyboard.bindKeyPress(key, function() smartWalk(dir) end, gameRootPanel)
 end
 
diff --git a/modules/game_textmessage/textmessage.lua b/modules/game_textmessage/textmessage.lua
index 8ef5bfd9..eca542c0 100644
--- a/modules/game_textmessage/textmessage.lua
+++ b/modules/game_textmessage/textmessage.lua
@@ -28,6 +28,8 @@ MessageTypes = {
   [MessageModes.Blue] = MessageSettings.consoleBlue,
   [MessageModes.PrivateFrom] = MessageSettings.consoleBlue,
 
+  [MessageModes.GamemasterBroadcast] = MessageSettings.consoleRed,
+
   [MessageModes.DamageDealed] = MessageSettings.status,
   [MessageModes.DamageReceived] = MessageSettings.status,
   [MessageModes.Heal] = MessageSettings.status,
diff --git a/src/client/creature.cpp b/src/client/creature.cpp
index 5ff87453..ffd29814 100644
--- a/src/client/creature.cpp
+++ b/src/client/creature.cpp
@@ -458,6 +458,11 @@ void Creature::updateWalkAnimation(int totalPixelsWalked)
 
     int footAnimPhases = getAnimationPhases() - 1;
     int footDelay = getStepDuration(true) / 3;
+    // Since mount is a different outfit we need to get the mount animation phases
+    if(m_outfit.getMount() != 0) {
+        ThingType *type = g_things.rawGetThingType(m_outfit.getMount(), m_outfit.getCategory());
+        footAnimPhases = type->getAnimationPhases() - 1;
+    }
     if(footAnimPhases == 0)
         m_walkAnimationPhase = 0;
     else if(m_footStepDrawn && m_footTimer.ticksElapsed() >= footDelay && totalPixelsWalked < 32) {