diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp
index 2185d15f99..642e546d06 100644
--- a/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -377,7 +377,10 @@ void KWinDecorationModule::updatePreviews()
     const int h = m_ui->decorationList->rootObject()->property("contentHeight").toInt();
     const int y = m_ui->decorationList->rootObject()->property("contentY").toInt();
     // start at first element in sight
-    m_model->regeneratePreviews(y*m_model->rowCount()/h);
+    int row = 0;
+    if (h > 0)
+        row = qMin(qMax(0, y*m_model->rowCount()/h), m_model->rowCount());
+    m_model->regeneratePreviews(row);
 }
 
 void KWinDecorationModule::updatePreviewWidth()
diff --git a/scripting/scriptedeffect.cpp b/scripting/scriptedeffect.cpp
index 44cea28054..610f02a81d 100644
--- a/scripting/scriptedeffect.cpp
+++ b/scripting/scriptedeffect.cpp
@@ -147,7 +147,7 @@ ScriptedEffect::ScriptedEffect()
 {
     connect(m_engine, SIGNAL(signalHandlerException(QScriptValue)), SLOT(signalHandlerException(QScriptValue)));
 #ifdef KWIN_BUILD_SCREENEDGES
-    connect(Workspace::self()->screenEdge(), SIGNAL(activated(ElectricBorder)), SLOT(borderActivated(ElectricBorder)));
+    connect(Workspace::self()->screenEdge(), SIGNAL(activated(ElectricBorder)), SLOT(slotBorderActivated(ElectricBorder)));
 #endif
 }