diff --git a/modules/client_entergame/entergame.lua b/modules/client_entergame/entergame.lua
index 0b8fc5d4..99360a04 100644
--- a/modules/client_entergame/entergame.lua
+++ b/modules/client_entergame/entergame.lua
@@ -112,7 +112,7 @@ function EnterGame.firstShow()
   local host = g_settings.get('host')
   local autologin = g_settings.getBoolean('autologin')
   if #host > 0 and #password > 0 and #account > 0 and autologin then
-    autoLogiEvent = addEvent(EnterGame.doLogin)
+    autoLoginEvent = addEvent(EnterGame.doLogin)
   end
 end
 
@@ -122,10 +122,14 @@ function EnterGame.terminate()
   enterGame = nil
   enterGameButton:destroy()
   enterGameButton = nil
-  motdWindow:destroy()
-  motdWindow = nil
-  motdButton:destroy()
-  motdButton = nil
+  if motdWindow then
+    motdWindow:destroy()
+    motdWindow = nil
+  end
+  if motdButton then
+    motdButton:destroy()
+    motdButton = nil
+  end
   protocolBox = nil
   EnterGame = nil
 end
@@ -157,7 +161,7 @@ function EnterGame.clearAccountFields()
 end
 
 function EnterGame.doLogin()
-  autoLogiEvent = nil
+  autoLoginEvent = nil
   G.account = enterGame:getChildById('accountNameTextEdit'):getText()
   G.password = enterGame:getChildById('accountPasswordTextEdit'):getText()
   G.host = enterGame:getChildById('serverHostTextEdit'):getText()
@@ -222,8 +226,8 @@ function EnterGame.setDefaultServer(host, port, protocol)
     accountTextEdit:setText('')
     passwordTextEdit:setText('')
 
-    if autoLogiEvent then
-      autoLogiEvent:cancel()
+    if autoLoginEvent then
+      autoLoginEvent:cancel()
     end
   end
 end
diff --git a/modules/game_console/console.otui b/modules/game_console/console.otui
index f156f0f2..86cc7fcf 100644
--- a/modules/game_console/console.otui
+++ b/modules/game_console/console.otui
@@ -110,6 +110,7 @@ Panel
     @onClick: |
       local consoleTabBar = self:getParent():getChildById('consoleTabBar')
       consoleTabBar:getCurrentTab().tabPanel:getChildById('consoleBuffer'):destroyChildren()
+      consoleTabBar:getCurrentTab().tabPanel:getChildById('consoleBufferHighlight'):destroyChildren()
 
   TabButton
     id: channelsButton
diff --git a/modules/game_interface/gameinterface.lua b/modules/game_interface/gameinterface.lua
index 1bdb0e31..252c3a30 100644
--- a/modules/game_interface/gameinterface.lua
+++ b/modules/game_interface/gameinterface.lua
@@ -185,7 +185,7 @@ function smartWalk(defaultDir)
   local rebindKey = false
   local lastKey = arrowKeys[lastWalkDir]
 
-  -- choose a new direction
+  -- choose the new direction
   if not g_keyboard.isKeyPressed(arrowKeys[defaultDir]) then
     local changeDir = false
     for k,v in pairs(arrowKeys) do