diff --git a/TODO b/TODO
index 2a94f07c..f44ecdaf 100644
--- a/TODO
+++ b/TODO
@@ -22,9 +22,6 @@ fix use with
 move windows
 let windows open while playing
 fix auto repeats in lineedit
-trade
-battlelist
-offer window
 
 ====================================================
 Low priority TODO
@@ -43,6 +40,8 @@ use hardware buffer
 use indices
 fix opacity and cached framebuffers conflict
 
+map rendering could be optimized to infinite zoom out using quadtree voxels
+
 == Lua
 make possible to bind non LuaObject derived classes on lua engine (for usage with Point,Rect,Color,Size)
 review usage of x,y/width,height in lua instead of point/size
@@ -76,6 +75,7 @@ terminal/console scrolling
 auto walk
 hotkeys window
 trade window
+shop window
 battle list
 implement left panel with dragging windows
 clean sprites cache periodically
diff --git a/modules/core_widgets/uispinbox.lua b/modules/core_widgets/uispinbox.lua
index 8a6f0b97..5c060fa3 100644
--- a/modules/core_widgets/uispinbox.lua
+++ b/modules/core_widgets/uispinbox.lua
@@ -52,14 +52,6 @@ function UISpinBox:onMouseWheel(mousePos, direction)
   return true
 end
 
-function UISpinBox:onStyleApply(styleName, styleNode)
-  if styleNode.options then
-    for k,option in pairs(styleNode.options) do
-      self:addOption(option)
-    end
-  end
-end
-
 function UISpinBox:onTextChange(text)
   local number = tonumber(text)
   if not number or number > self.m_maximum or number < self.m_minimum then
diff --git a/modules/game/movewindow.otui b/modules/game/movewindow.otui
index 0371ad9a..9e0438f8 100644
--- a/modules/game/movewindow.otui
+++ b/modules/game/movewindow.otui
@@ -1,21 +1,21 @@
 MainWindow
   text: Move Item
   size: 196 112
-  @onEscape: self:getParent():destroy()
-  
+  @onEscape: self:destroy()
+
   Label
     text: Amount:
     width: 64
     anchors.left: parent.left
     anchors.top: parent.top
     margin-top: 2
-    
+
   SpinBox
     id: spinbox
     anchors.left: prev.right
     anchors.right: parent.right
     anchors.top: parent.top
-    
+
   HorizontalSeparator
     id: separator
     anchors.left: parent.left
diff --git a/src/otclient/net/protocolcodes.h b/src/otclient/net/protocolcodes.h
index 599ad384..9782b71e 100644
--- a/src/otclient/net/protocolcodes.h
+++ b/src/otclient/net/protocolcodes.h
@@ -25,7 +25,7 @@
 
 #include <otclient/global.h>
 
-#if PROTOCOL != 860 && PROTOCOL != 862
+#if PROTOCOL < 860 || PROTOCOL > 862
 #error "the supplied protocol version is not supported"
 #endif
 
@@ -49,7 +49,7 @@ namespace Proto {
 
 #if PROTOCOL==860
     const int NumViolationReasons = 20;
-#elif PROTOCOL==862
+#elif PROTOCOL==861 || PROTOCOL==862
     const int NumViolationReasons = 19;
 #endif
 
@@ -221,7 +221,7 @@ namespace Proto {
     };
 
     enum SpeakTypes {
-#if PROTOCOL==862
+#if PROTOCOL==861 || PROTOCOL==862
         SpeakSay = 1,
         SpeakWhisper,
         SpeakYell,
@@ -265,28 +265,28 @@ namespace Proto {
     };
 
     enum MessageTypes {
-#if PROTOCOL==860
-        MessageConsoleRed = 18,
-        MessageConsoleOrange,
+#if PROTOCOL==862 || PROTOCOL==861
+        MessageConsoleOrange = 13,
         MessageConsoleOrange2,
         MessageWarning,
         MessageEventAdvance,
         MessageEventDefault,
         MessageStatusDefault,
-        MessageInfoDescription ,
+        MessageInfoDescription,
         MessageStatusSmall,
-        MessageConsoleBlue
-#elif PROTOCOL==862
-        MessageConsoleOrange = 13,
+        MessageConsoleBlue,
+        MessageConsoleRed
+#elif PROTOCOL==860
+        MessageConsoleRed = 18,
+        MessageConsoleOrange,
         MessageConsoleOrange2,
         MessageWarning,
         MessageEventAdvance,
         MessageEventDefault,
         MessageStatusDefault,
-        MessageInfoDescription,
+        MessageInfoDescription ,
         MessageStatusSmall,
-        MessageConsoleBlue,
-        MessageConsoleRed
+        MessageConsoleBlue
 #endif
     };