diff --git a/BUGS b/BUGS
index 93fcca5d..e69de29b 100644
--- a/BUGS
+++ b/BUGS
@@ -1,9 +0,0 @@
-trying to walking while following doesn't cancel de walk
-attacked/followed creatures are not cleared when it goes out of range
-hotkeys works while windows are locked, it shouldnt
-some animated hits are displayed as 2 hits instead of one
-skulls is rendering outside map bounds
-paste on x11 platform does not work correctly when doing ctrl+c in google chrome
-party options does not work when relogging inside a party
-
-when the player gets disconnected it isn't removed from the map
diff --git a/modules/client_entergame/entergame.lua b/modules/client_entergame/entergame.lua
index ca78f4ca..09f8c297 100644
--- a/modules/client_entergame/entergame.lua
+++ b/modules/client_entergame/entergame.lua
@@ -80,7 +80,6 @@ function EnterGame.init()
   enterGame:getChildById('accountNameTextEdit'):focus()
 
   -- only open entergame when app starts
-  enterGame:hide()
   if not g_app.isRunning() then
     if #account > 0 and autologin then
       addEvent(EnterGame.doLogin)
diff --git a/modules/client_entergame/login.png b/modules/client_entergame/login.png
index 1adfa2a5..55ec6975 100644
Binary files a/modules/client_entergame/login.png and b/modules/client_entergame/login.png differ
diff --git a/modules/game_viplist/viplist.png b/modules/game_viplist/viplist.png
index 2bedcaff..d0e69e70 100644
Binary files a/modules/game_viplist/viplist.png and b/modules/game_viplist/viplist.png differ
diff --git a/src/framework/graphics/painter.cpp b/src/framework/graphics/painter.cpp
index 4c9433ba..b5d19710 100644
--- a/src/framework/graphics/painter.cpp
+++ b/src/framework/graphics/painter.cpp
@@ -143,10 +143,10 @@ void Painter::setClipRect(const Rect& clipRect)
     if(clipRect.isValid()) {
         glEnable(GL_SCISSOR_TEST);
         glScissor(clipRect.left(), g_graphics.getViewportSize().height() - clipRect.bottom() - 1, clipRect.width(), clipRect.height());
-        m_clipRect = clipRect;
     } else {
         glDisable(GL_SCISSOR_TEST);
     }
+    m_clipRect = clipRect;
 }
 
 void Painter::saveAndResetState()
diff --git a/src/framework/platform/win32window.cpp b/src/framework/platform/win32window.cpp
index 5368fab9..e03576bd 100644
--- a/src/framework/platform/win32window.cpp
+++ b/src/framework/platform/win32window.cpp
@@ -687,16 +687,12 @@ void WIN32Window::setMouseCursor(const std::string& file, const Point& hotSpot)
     std::vector<uchar> xorMask(numbytes, 0);
 
     for(int i=0;i<numbits;++i) {
-        uchar r = apng.pdata[i*4+0];
-        uchar g = apng.pdata[i*4+1];
-        uchar b = apng.pdata[i*4+2];
-        uchar a = apng.pdata[i*4+3];
-        Color color(r,g,b,a);
-        if(color == Color::white) { //white
+        uint32 rgba = Fw::readLE32(apng.pdata + i*4);
+        if(rgba == 0xffffffff) { //white
             HSB_BIT_SET(xorMask, i);
-        } else if(color == Color::alpha) { //alpha
+        } else if(rgba == 0x00000000) { //alpha
             HSB_BIT_SET(andMask, i);
-        } //otherwise black
+        } // otherwise 0xff000000 => black
     }
     free_apng(&apng);
 
diff --git a/src/framework/platform/x11window.cpp b/src/framework/platform/x11window.cpp
index 892df0ad..b08ef1a3 100644
--- a/src/framework/platform/x11window.cpp
+++ b/src/framework/platform/x11window.cpp
@@ -632,7 +632,7 @@ void X11Window::poll()
                         XFree(propertyValue);
                     }
                 }
-        
+
                 // updates window pos
                 if(m_visible)
                     m_position = newPos;
@@ -794,6 +794,7 @@ void X11Window::poll()
 void X11Window::swapBuffers()
 {
 #ifndef OPENGL_ES2
+    glFinish();
     glXSwapBuffers(m_display, m_window);
 #else
     eglSwapBuffers(m_eglDisplay, m_eglSurface);
@@ -872,17 +873,13 @@ void X11Window::setMouseCursor(const std::string& file, const Point& hotSpot)
     std::vector<uchar> maskBits(numbytes, 0);
 
     for(int i=0;i<numbits;++i) {
-        uchar r = apng.pdata[i*4+0];
-        uchar g = apng.pdata[i*4+1];
-        uchar b = apng.pdata[i*4+2];
-        uchar a = apng.pdata[i*4+3];
-        Color color(r,g,b,a);
-        if(color == Color::white) { //background
+        uint32 rgba = Fw::readLE32(apng.pdata + i*4);
+        if(rgba == 0xffffffff) { //white, background
             LSB_BIT_SET(maskBits, i);
-        } else if(color == Color::black) { //foreground
+        } else if(rgba == 0xff000000) { //black, foreground
             LSB_BIT_SET(mapBits, i);
             LSB_BIT_SET(maskBits, i);
-        } //otherwise alpha
+        } //otherwise 0x00000000 => alpha
     }
     free_apng(&apng);