diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt
index ebc04b97..baf7a7dd 100644
--- a/src/framework/CMakeLists.txt
+++ b/src/framework/CMakeLists.txt
@@ -113,6 +113,7 @@ SET(framework_LIBRARIES
     ${GLEW_LIBRARY}
     ${OPENGL_LIBRARIES}
     ${OPENGLES_LIBRARY}
+    ${EGL_LIBRARY}
     ${LUA_LIBRARIES}
     ${PHYSFS_LIBRARY}
     ${GMP_LIBRARY}
diff --git a/src/framework/application.h b/src/framework/application.h
index b09f2942..3d1ebd69 100644
--- a/src/framework/application.h
+++ b/src/framework/application.h
@@ -47,7 +47,7 @@ public:
 
     bool isRunning() { return m_running; }
     bool isStopping() { return m_stopping; }
-    std::string getAppName() { return m_appName; }
+    const std::string& getAppName() { return m_appName; }
 
 protected:
     virtual void render();
diff --git a/src/framework/graphics/shader.cpp b/src/framework/graphics/shader.cpp
index 0dad6090..8248fbd5 100644
--- a/src/framework/graphics/shader.cpp
+++ b/src/framework/graphics/shader.cpp
@@ -55,8 +55,8 @@ bool Shader::compileSourceCode(const std::string& sourceCode)
     static const char *qualifierDefines =
         "#ifndef GL_FRAGMENT_PRECISION_HIGH\n"
         "#define highp mediump\n"
-        "#endif\n";
-        "precision highp float;\n"
+        "#endif\n"
+        "precision highp float;\n";
 #endif
 
     std::string code = qualifierDefines;
diff --git a/src/framework/platform/x11window.cpp b/src/framework/platform/x11window.cpp
index ddd71d2f..83292ce2 100644
--- a/src/framework/platform/x11window.cpp
+++ b/src/framework/platform/x11window.cpp
@@ -421,7 +421,7 @@ void X11Window::internalDestroyGLContext()
             eglDestroyContext(m_eglDisplay, m_eglContext);
             m_eglContext = 0;
         }
-        if(m_eglSurface)
+        if(m_eglSurface) {
             eglDestroySurface(m_eglDisplay, m_eglSurface);
             m_eglSurface = 0;
         }
diff --git a/src/otclient/core/creature.cpp b/src/otclient/core/creature.cpp
index c3f54731..a18d8184 100644
--- a/src/otclient/core/creature.cpp
+++ b/src/otclient/core/creature.cpp
@@ -315,13 +315,8 @@ void Creature::setOutfit(const Outfit& outfit)
     m_outfit = outfit;
     m_type = getType();
 
-    // Do not apply any mask color.
-    if(m_type->dimensions[ThingType::Layers] == 1) {
-        m_outfit.setHead(0);
-        m_outfit.setBody(0);
-        m_outfit.setLegs(0);
-        m_outfit.setFeet(0);
-    }
+    if(m_type->dimensions[ThingType::Layers] == 1)
+        m_outfit.resetClothes();
 }
 
 ThingType *Creature::getType()
diff --git a/src/otclient/core/outfit.cpp b/src/otclient/core/outfit.cpp
index 55392fea..a0bc30c2 100644
--- a/src/otclient/core/outfit.cpp
+++ b/src/otclient/core/outfit.cpp
@@ -117,3 +117,11 @@ Color Outfit::getColor(int color)
     }
     return Color(int(red * 255), int(green * 255), int(blue * 255));
 }
+
+void Outfit::resetClothes()
+{
+    setHead(0);
+    setBody(0);
+    setLegs(0);
+    setFeet(0);
+}
diff --git a/src/otclient/core/outfit.h b/src/otclient/core/outfit.h
index c20d54e8..acef0908 100644
--- a/src/otclient/core/outfit.h
+++ b/src/otclient/core/outfit.h
@@ -44,6 +44,8 @@ public:
     void setFeet(int feet) { m_feet = feet; m_feetColor = getColor(feet); }
     void setAddons(int addons) { m_addons = addons; }
 
+    void resetClothes();
+
     int getType() const { return m_type; }
     int getHead() const { return m_head; }
     int getBody() const { return m_body; }