diff --git a/effects/presentwindows/presentwindows_config.ui b/effects/presentwindows/presentwindows_config.ui
index 66038330db..1426be1c75 100644
--- a/effects/presentwindows/presentwindows_config.ui
+++ b/effects/presentwindows/presentwindows_config.ui
@@ -178,9 +178,6 @@
         <property name="text">
          <string>Faster</string>
         </property>
-        <property name="buddy">
-         <cstring></cstring>
-        </property>
        </widget>
       </item>
       <item row="0" column="1">
@@ -228,9 +225,6 @@
         <property name="text">
          <string>Nicer</string>
         </property>
-        <property name="buddy">
-         <cstring></cstring>
-        </property>
        </widget>
       </item>
      </layout>
diff --git a/kcmkwin/kwindecoration/buttons.h b/kcmkwin/kwindecoration/buttons.h
index 05411ad4d6..ba0cf5770b 100644
--- a/kcmkwin/kwindecoration/buttons.h
+++ b/kcmkwin/kwindecoration/buttons.h
@@ -106,6 +106,7 @@ class ButtonSourceItem : public Q3ListViewItem
 		ButtonSourceItem(Q3ListView * parent, const Button& btn);
 		virtual ~ButtonSourceItem();
 
+		using Q3ListViewItem::paintCell;
 		void paintCell(QPainter *p, const QPalette &cg, int column, int width, int align);
 
 		void setButton(const Button& btn);
diff --git a/kcmkwin/kwinrules/ruleswidgetbase.ui b/kcmkwin/kwinrules/ruleswidgetbase.ui
index 675d4ad4c2..8e7a93a1c8 100644
--- a/kcmkwin/kwinrules/ruleswidgetbase.ui
+++ b/kcmkwin/kwinrules/ruleswidgetbase.ui
@@ -18,7 +18,7 @@
      <property name="currentIndex" >
       <number>0</number>
      </property>
-     <widget class="QWidget" name="tab" >
+     <widget class="QWidget" name="TabPage1" >
       <property name="geometry" >
        <rect>
         <x>0</x>
@@ -245,7 +245,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab" >
+     <widget class="QWidget" name="TabPage2" >
       <property name="geometry" >
        <rect>
         <x>0</x>
@@ -541,7 +541,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="TabPage" >
+     <widget class="QWidget" name="TabPage3" >
       <property name="geometry" >
        <rect>
         <x>0</x>
@@ -1087,7 +1087,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="TabPage" >
+     <widget class="QWidget" name="TabPage4" >
       <property name="geometry" >
        <rect>
         <x>0</x>
@@ -1605,7 +1605,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="TabPage" >
+     <widget class="QWidget" name="TabPage5" >
       <property name="geometry" >
        <rect>
         <x>0</x>