diff --git a/client.cpp b/client.cpp
index 93dc022d18..9ca5332a18 100644
--- a/client.cpp
+++ b/client.cpp
@@ -574,9 +574,14 @@ void Client::resizeDecoration()
     updateInputWindow();
 }
 
+bool Client::userNoBorder() const
+{
+    return noborder;
+}
+
 bool Client::noBorder() const
 {
-    return noborder || isFullScreen();
+    return userNoBorder() || isFullScreen();
 }
 
 bool Client::userCanSetNoBorder() const
diff --git a/client.h b/client.h
index 0a88bb63ad..5a233ab91d 100644
--- a/client.h
+++ b/client.h
@@ -153,6 +153,7 @@ public:
         return fullscreen_mode;    // only for session saving
     }
 
+    bool userNoBorder() const;
     bool noBorder() const override;
     void setNoBorder(bool set) override;
     bool userCanSetNoBorder() const override;
diff --git a/plugins/platforms/x11/standalone/glxbackend.cpp b/plugins/platforms/x11/standalone/glxbackend.cpp
index a2c570e59d..eb2d46414f 100644
--- a/plugins/platforms/x11/standalone/glxbackend.cpp
+++ b/plugins/platforms/x11/standalone/glxbackend.cpp
@@ -115,6 +115,10 @@ GlxBackend::GlxBackend(Display *display)
     , haveSwapInterval(false)
     , m_x11Display(display)
 {
+     // Force initialization of GLX integration in the Qt's xcb backend
+     // to make it call XESetWireToEvent callbacks, which is required
+     // by Mesa when using DRI2.
+     QOpenGLContext::supportsThreadedOpenGL();
 }
 
 static bool gs_tripleBufferUndetected = true;
diff --git a/sm.cpp b/sm.cpp
index 80804c71ce..da1c7e0784 100644
--- a/sm.cpp
+++ b/sm.cpp
@@ -172,7 +172,7 @@ void Workspace::storeClient(KConfigGroup &cg, int num, Client *c)
     cg.writeEntry(QLatin1String("skipPager") + n, c->skipPager());
     cg.writeEntry(QLatin1String("skipSwitcher") + n, c->skipSwitcher());
     // not really just set by user, but name kept for back. comp. reasons
-    cg.writeEntry(QLatin1String("userNoBorder") + n, c->noBorder());
+    cg.writeEntry(QLatin1String("userNoBorder") + n, c->userNoBorder());
     cg.writeEntry(QLatin1String("windowType") + n, windowTypeToTxt(c->windowType()));
     cg.writeEntry(QLatin1String("shortcut") + n, c->shortcut().toString());
     cg.writeEntry(QLatin1String("stackingOrder") + n, unconstrained_stacking_order.indexOf(c));