diff --git a/client.h b/client.h
index 4a5487857c..7d4651a306 100644
--- a/client.h
+++ b/client.h
@@ -68,7 +68,8 @@ inline WId WindowWrapper::window() const
 }
 
 
-
+// NOTE: this class has to keep binary compatibility, just like other
+// KWin classes accessible from the plugins
 class Client : public QWidget
 {
     Q_OBJECT
diff --git a/options.h b/options.h
index 4231c47002..5fee78607a 100644
--- a/options.h
+++ b/options.h
@@ -17,7 +17,8 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 namespace KWinInternal {
 
 class OptionsPrivate;
-
+// NOTE: this class has to keep binary compatibility, just like other
+// KWin classes accessible from the plugins
 class Options : public QObject {
     Q_OBJECT
 public:
diff --git a/workspace.cpp b/workspace.cpp
index b36096189b..cf23fc0c1d 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -1077,9 +1077,9 @@ int Workspace::nextDesktop( int iDesktop ) const
 	if( i >= 0 && i+1 < (int)desktop_focus_chain.size() )
 		return desktop_focus_chain[i+1];
 	else if( desktop_focus_chain.size() > 0 )
-		return 1;
+		return desktop_focus_chain[ 0 ];
 	else
-		return 0;
+		return 1;
 }
 
 int Workspace::previousDesktop( int iDesktop ) const
@@ -2332,7 +2332,7 @@ void Workspace::setCurrentDesktop( int new_desktop ){
     // Update focus chain:
     //  If input: chain = { 1, 2, 3, 4 } and current_desktop = 3,
     //   Output: chain = { 3, 1, 2, 4 }.
-    kdDebug() << QString("Switching to desktop #%1, at focus_chain index %2\n")
+    kdDebug(1212) << QString("Switching to desktop #%1, at focus_chain index %2\n")
     	.arg(current_desktop).arg(desktop_focus_chain.find( current_desktop ));
     for( int i = desktop_focus_chain.find( current_desktop ); i > 0; i-- )
         desktop_focus_chain[i] = desktop_focus_chain[i-1];
@@ -2341,7 +2341,7 @@ void Workspace::setCurrentDesktop( int new_desktop ){
     QString s = "desktop_focus_chain[] = { ";
     for( uint i = 0; i < desktop_focus_chain.size(); i++ )
         s += QString::number(desktop_focus_chain[i]) + ", ";
-    kdDebug() << s << "}\n";
+    kdDebug(1212) << s << "}\n";
 }
 
 void Workspace::nextDesktop()
diff --git a/workspace.h b/workspace.h
index 4397f388ed..8bf234bc62 100644
--- a/workspace.h
+++ b/workspace.h
@@ -95,6 +95,8 @@ public:
 };
 
 class WorkspacePrivate;
+// NOTE: this class has to keep binary compatibility, just like other
+// KWin classes accessible from the plugins
 
 class Workspace : public QObject, virtual public KWinInterface
 {