diff --git a/modules/game_interface/gameinterface.lua b/modules/game_interface/gameinterface.lua
index 378403ff..1b316b22 100644
--- a/modules/game_interface/gameinterface.lua
+++ b/modules/game_interface/gameinterface.lua
@@ -257,10 +257,12 @@ function createThingMenu(menuPosition, lookThing, useThing, creatureThing)
     if creatureThing:isLocalPlayer() then
       menu:addOption(tr('Set Outfit'), function() g_game.requestOutfit() end)
 
-      if not localPlayer:isMounted() then
-        menu:addOption(tr('Mount'), function() localPlayer:mount() end)
-      else
-        menu:addOption(tr('Dismount'), function() localPlayer:dismount() end)
+      if g_game.getFeature(GamePlayerMounts) then
+        if not localPlayer:isMounted() then
+          menu:addOption(tr('Mount'), function() localPlayer:mount() end)
+        else
+          menu:addOption(tr('Dismount'), function() localPlayer:dismount() end)
+        end
       end
 
       if creatureThing:isPartyMember() then
diff --git a/modules/game_outfit/outfit.lua b/modules/game_outfit/outfit.lua
index aa9c2664..50809a3b 100644
--- a/modules/game_outfit/outfit.lua
+++ b/modules/game_outfit/outfit.lua
@@ -47,6 +47,10 @@ function updateMount()
 end
 
 function create(creatureOutfit, outfitList, creatureMount, mountList)
+  if outfitWindow and not outfitWindow:isHidden() then
+    return
+  end
+  
   outfitCreature = creatureOutfit
   mountCreature = creatureMount
   outfits = outfitList
diff --git a/modules/game_skills/skills.lua b/modules/game_skills/skills.lua
index aa47e8db..f11b4ae5 100644
--- a/modules/game_skills/skills.lua
+++ b/modules/game_skills/skills.lua
@@ -70,7 +70,7 @@ function resetSkillColor(id)
 end
 
 function setSkillBase(id, value, baseValue)
-  if baseValue < 0 or value < 0 then
+  if baseValue <= 0 or value < 0 then
     return
   end
   local skill = skillsWindow:recursiveGetChildById(id)
diff --git a/modules/gamelib/game.lua b/modules/gamelib/game.lua
index 817f5b8e..0a5b2cb7 100644
--- a/modules/gamelib/game.lua
+++ b/modules/gamelib/game.lua
@@ -49,7 +49,7 @@ end
 function g_game.getSupportedProtocols()
   return {
     810, 853, 854, 860, 861, 862, 870, 
-	910, 940, 944, 953, 954, 960, 961
+    910, 940, 944, 953, 954, 960, 961
   }
 end