diff --git a/debug_console.ui b/debug_console.ui
index c13be1881b..cb6cc0ae16 100644
--- a/debug_console.ui
+++ b/debug_console.ui
@@ -10,9 +10,6 @@
600
-
- Form
-
-
diff --git a/effects/zoom/zoom.cpp b/effects/zoom/zoom.cpp
index 1868c6bbef..efdec578a0 100644
--- a/effects/zoom/zoom.cpp
+++ b/effects/zoom/zoom.cpp
@@ -192,8 +192,10 @@ void ZoomEffect::recreateTexture()
imageWidth = cursor.image().width();
imageHeight = cursor.image().height();
cursorHotSpot = cursor.hotSpot();
- if (effects->isOpenGLCompositing())
+ if (effects->isOpenGLCompositing()) {
texture.reset(new GLTexture(cursor.image()));
+ texture->setWrapMode(GL_CLAMP_TO_EDGE);
+ }
#ifdef KWIN_HAVE_XRENDER_COMPOSITING
if (effects->compositingType() == XRenderCompositing)
xrenderPicture.reset(new XRenderPicture(cursor.image()));
diff --git a/plugins/scenes/qpainter/qpainter.json b/plugins/scenes/qpainter/qpainter.json
index 6327bbfa75..459ddb27e0 100644
--- a/plugins/scenes/qpainter/qpainter.json
+++ b/plugins/scenes/qpainter/qpainter.json
@@ -31,7 +31,7 @@
"Description[tr]": "QPainter üzerinden KWin Dizgici eklentisi oluşturma",
"Description[uk]": "Додаток засобу композиції KWin для обробки з використанням QPainter",
"Description[x-test]": "xxKWin Compositor plugin rendering through QPainterxx",
- "Description[zh_CN]": "使用 QPainter 渲染的 KWin 合成插件",
+ "Description[zh_CN]": "使用 QPainter 渲染的 KWin 混成插件",
"Description[zh_TW]": "透過 QPainter 繪製 KWin 合成器附加元件",
"Id": "KWinSceneQPainter",
"Name": "SceneQPainter",
diff --git a/plugins/scenes/xrender/xrender.json b/plugins/scenes/xrender/xrender.json
index 1c75605be3..ada3b3bd70 100644
--- a/plugins/scenes/xrender/xrender.json
+++ b/plugins/scenes/xrender/xrender.json
@@ -31,7 +31,7 @@
"Description[tr]": "XRender üzerinden KWin Dizgici eklentisi oluşturma",
"Description[uk]": "Додаток засобу композиції KWin для обробки з використанням XRender",
"Description[x-test]": "xxKWin Compositor plugin rendering through XRenderxx",
- "Description[zh_CN]": "使用 XRender 渲染的 KWin 合成插件",
+ "Description[zh_CN]": "使用 XRender 渲染的 KWin 混成插件",
"Description[zh_TW]": "透過 XRender 繪製 KWin 合成器附加元件",
"Id": "KWinSceneXRender",
"Name": "SceneXRender",