diff --git a/data/update_window_settings.cpp b/data/update_window_settings.cpp
index 25685776b6..7c9580f663 100644
--- a/data/update_window_settings.cpp
+++ b/data/update_window_settings.cpp
@@ -67,32 +67,32 @@ NET::WindowType txtToWindowType( const char* txt )
 void loadFakeSessionInfo( KConfig* config )
     {
     fakeSession.clear();
-    config->setGroup("FakeSession" );
-    int count =  config->readEntry( "count",0 );
+    KConfigGroup fakeGroup(config, "FakeSession");
+    int count = fakeGroup->readEntry( "count",0 );
     for ( int i = 1; i <= count; i++ ) 
         {
         QString n = QString::number(i);
         SessionInfo* info = new SessionInfo;
         fakeSession.append( info );
-        info->windowRole = config->readEntry( QString("windowRole")+n, QString() ).toLatin1();
-        info->resourceName = config->readEntry( QString("resourceName")+n, QString() ).toLatin1();
-        info->resourceClass = config->readEntry( QString("resourceClass")+n, QString() ).toLower().toLatin1();
-        info->wmClientMachine = config->readEntry( QString("clientMachine")+n, QString() ).toLatin1();
-        info->geometry = config->readEntry( QString("geometry")+n, QRect() );
-        info->restore = config->readEntry( QString("restore")+n, QRect() );
-        info->fsrestore = config->readEntry( QString("fsrestore")+n, QRect() );
-        info->maximized = config->readEntry( QString("maximize")+n, 0 );
-        info->fullscreen = config->readEntry( QString("fullscreen")+n, 0 );
-        info->desktop = config->readEntry( QString("desktop")+n, 0 );
-        info->minimized = config->readEntry( QString("iconified")+n, false );
-        info->onAllDesktops = config->readEntry( QString("sticky")+n, false );
-        info->shaded = config->readEntry( QString("shaded")+n, false );
-        info->keepAbove = config->readEntry( QString("staysOnTop")+n, false  );
-        info->keepBelow = config->readEntry( QString("keepBelow")+n, false  );
-        info->skipTaskbar = config->readEntry( QString("skipTaskbar")+n, false  );
-        info->skipPager = config->readEntry( QString("skipPager")+n, false  );
-        info->userNoBorder = config->readEntry( QString("userNoBorder")+n, false  );
-        info->windowType = txtToWindowType( config->readEntry( QString("windowType")+n, QString() ).toLatin1());
+        info->windowRole = fakeGroup->readEntry( QString("windowRole")+n, QString() ).toLatin1();
+        info->resourceName = fakeGroup->readEntry( QString("resourceName")+n, QString() ).toLatin1();
+        info->resourceClass = fakeGroup->readEntry( QString("resourceClass")+n, QString() ).toLower().toLatin1();
+        info->wmClientMachine = fakeGroup->readEntry( QString("clientMachine")+n, QString() ).toLatin1();
+        info->geometry = fakeGroup->readEntry( QString("geometry")+n, QRect() );
+        info->restore = fakeGroup->readEntry( QString("restore")+n, QRect() );
+        info->fsrestore = fakeGroup->readEntry( QString("fsrestore")+n, QRect() );
+        info->maximized = fakeGroup->readEntry( QString("maximize")+n, 0 );
+        info->fullscreen = fakeGroup->readEntry( QString("fullscreen")+n, 0 );
+        info->desktop = fakeGroup->readEntry( QString("desktop")+n, 0 );
+        info->minimized = fakeGroup->readEntry( QString("iconified")+n, false );
+        info->onAllDesktops = fakeGroup->readEntry( QString("sticky")+n, false );
+        info->shaded = fakeGroup->readEntry( QString("shaded")+n, false );
+        info->keepAbove = fakeGroup->readEntry( QString("staysOnTop")+n, false  );
+        info->keepBelow = fakeGroup->readEntry( QString("keepBelow")+n, false  );
+        info->skipTaskbar = fakeGroup->readEntry( QString("skipTaskbar")+n, false  );
+        info->skipPager = fakeGroup->readEntry( QString("skipPager")+n, false  );
+        info->userNoBorder = fakeGroup->readEntry( QString("userNoBorder")+n, false  );
+        info->windowType = txtToWindowType( fakeGroup->readEntry( QString("windowType")+n, QString() ).toLatin1());
         info->active = false;
         info->fake = true;
         }
diff --git a/lib/kdecoration.h b/lib/kdecoration.h
index 05f40645be..da5d53619f 100644
--- a/lib/kdecoration.h
+++ b/lib/kdecoration.h
@@ -795,11 +795,11 @@ class KWIN_EXPORT KDecoration
         /**
          * @internal
          */
-        void emitKeepAboveChanged( bool above ) { emit keepAboveChanged( above ); }
+        void emitKeepAboveChanged( bool above ) { keepAboveChanged( above ); }
         /**
          * @internal
          */
-        void emitKeepBelowChanged( bool below ) { emit keepBelowChanged( below ); }
+        void emitKeepBelowChanged( bool below ) { keepBelowChanged( below ); }
     private:
 	KDecorationBridge* bridge_;
 	QWidget* w_;