diff --git a/kcmkwin/kwindecoration/buttons.cpp b/kcmkwin/kwindecoration/buttons.cpp
index 4c8a084c76..18985d6359 100644
--- a/kcmkwin/kwindecoration/buttons.cpp
+++ b/kcmkwin/kwindecoration/buttons.cpp
@@ -693,7 +693,8 @@ ButtonPositionWidget::ButtonPositionWidget(QWidget *parent, const char* name)
 	label->setText( i18n( "To add or remove titlebar buttons, simply <i>drag</i> items "
 		"between the available item list and the titlebar preview. Similarly, "
 		"drag items within the titlebar preview to re-position them.") );
-	m_buttonSource = new ButtonSource(this, "button_source");
+	m_buttonSource = new ButtonSource(this);
+    m_buttonSource->setObjectName("button_source");
 
 	layout->addWidget(label);
 	layout->addWidget(m_dropSite);
diff --git a/kwinbindings.cpp b/kwinbindings.cpp
index 6791c13540..10caac757f 100644
--- a/kwinbindings.cpp
+++ b/kwinbindings.cpp
@@ -29,9 +29,9 @@
 	DEF( I18N_NOOP("Walk Through Desktop List (Reverse)"), 0, slotWalkBackThroughDesktopList() );
 
 	keys->insert( "Group:Windows", i18n("Windows") );
-	DEF( I18N_NOOP("Window Operations Menu"),              ALT+Qt::Key_F3, ALT+Qt::Key_Menu, slotWindowOperations() );
+	DEF( I18N_NOOP("Window Operations Menu"),              ALT+Qt::Key_Menu, slotWindowOperations() );
 	DEF2( "Window Close", I18N_NOOP("Close Window"),
-            ALT+Qt::Key_F4, "Alt+Escape;Alt+F4", slotWindowClose() );
+            "Alt+Escape;Alt+F4", slotWindowClose() );
 	DEF2( "Window Maximize", I18N_NOOP("Maximize Window"),
             WIN+Qt::Key_Plus, slotWindowMaximize() );
 	DEF2( "Window Maximize Vertical", I18N_NOOP("Maximize Window Vertically"),
@@ -111,16 +111,16 @@
 	DEF( I18N_NOOP("Window One Desktop Down"),             0, slotWindowToDesktopDown() );
 
 	keys->insert( "Group:Desktop Switching", i18n("Desktop Switching") );
-	DEF( I18N_NOOP("Switch to Desktop 1"),  CTRL+Qt::Key_F1, WIN+Qt::Key_F1, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 2"),  CTRL+Qt::Key_F2, WIN+Qt::Key_F2, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 3"),  CTRL+Qt::Key_F3, WIN+Qt::Key_F3, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 4"),  CTRL+Qt::Key_F4, WIN+Qt::Key_F4, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 5"),  CTRL+Qt::Key_F5, WIN+Qt::Key_F5, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 6"),  CTRL+Qt::Key_F6, WIN+Qt::Key_F6, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 7"),  CTRL+Qt::Key_F7, WIN+Qt::Key_F7, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 8"),  CTRL+Qt::Key_F8, WIN+Qt::Key_F8, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 9"),  CTRL+Qt::Key_F9, WIN+Qt::Key_F9, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 10"),  CTRL+Qt::Key_F10, WIN+Qt::Key_F10, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 1"),  WIN+Qt::Key_F1, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 2"),  WIN+Qt::Key_F2, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 3"),  WIN+Qt::Key_F3, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 4"),  WIN+Qt::Key_F4, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 5"),  WIN+Qt::Key_F5, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 6"),  WIN+Qt::Key_F6, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 7"),  WIN+Qt::Key_F7, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 8"),  WIN+Qt::Key_F8, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 9"),  WIN+Qt::Key_F9, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 10"),  WIN+Qt::Key_F10, slotSwitchToDesktop(int) );
 	DEF( I18N_NOOP("Switch to Desktop 11"),  CTRL+Qt::Key_F11, slotSwitchToDesktop(int) );
 	DEF( I18N_NOOP("Switch to Desktop 12"),  CTRL+Qt::Key_F12, slotSwitchToDesktop(int) );
 	DEF( I18N_NOOP("Switch to Desktop 13"),  CTRL+SHIFT+Qt::Key_F1, slotSwitchToDesktop(int) );
@@ -140,9 +140,9 @@
 
 	keys->insert( "Group:Miscellaneous", i18n("Miscellaneous") );
 	DEF( I18N_NOOP("Mouse Emulation"),                     ALT+Qt::Key_F12, slotMouseEmulation() );
-	DEF( I18N_NOOP("Kill Window"),                         ALT+CTRL+Qt::Key_Escape, WIN+CTRL+Qt::Key_Delete, slotKillWindow() );
+	DEF( I18N_NOOP("Kill Window"),                         WIN+CTRL+Qt::Key_Delete, slotKillWindow() );
 	DEF( I18N_NOOP("Window Screenshot"),                   ALT+Qt::Key_Print, slotGrabWindow() );
-	DEF( I18N_NOOP("Desktop Screenshot"),                  CTRL+Qt::Key_Print, WIN+Qt::Key_Print, slotGrabDesktop() );
+	DEF( I18N_NOOP("Desktop Screenshot"),                  WIN+Qt::Key_Print, slotGrabDesktop() );
 #ifdef IN_KWIN
         {
         KGlobalAccel* keys = disable_shortcuts_keys;
diff --git a/useractions.cpp b/useractions.cpp
index f1921122e4..2c2d5fb3c0 100644
--- a/useractions.cpp
+++ b/useractions.cpp
@@ -99,7 +99,7 @@ Q3PopupMenu* Workspace::clientPopup()
         popup->insertSeparator();
 
         if (!KGlobal::config()->isImmutable() && 
-            !KAuthorized::authorizeKActionControlModules(Workspace::configModules(true)).isEmpty())
+            !KAuthorized::authorizeControlModules(Workspace::configModules(true)).isEmpty())
             {
             popup->insertItem(SmallIconSet( "configure" ), i18n("Configur&e Window Behavior..."), this, SLOT( configureWM() ));
             popup->insertSeparator();