diff --git a/kcmkwin/kwinoptions/windows.cpp b/kcmkwin/kwinoptions/windows.cpp
index d029247bf4..5f1925af33 100644
--- a/kcmkwin/kwinoptions/windows.cpp
+++ b/kcmkwin/kwinoptions/windows.cpp
@@ -654,7 +654,7 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, const KCom
     tilingLayoutLabel = new QLabel( i18n("Default Tiling &Layout"), tilBox );
     tilBoxLay->addWidget( tilingLayoutLabel, 1, 0 );
 
-    tilingLayoutCombo = new QComboBox( tilBox );
+    tilingLayoutCombo = new KComboBox( tilBox );
 
     // NOTE: add your layout to the bottom of this list
     tilingLayoutCombo->addItem( "Spiral" );
@@ -668,7 +668,7 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, const KCom
     tilingRaiseLabel = new QLabel( i18n("Floating &Windows Raising"), tilBox );
     tilBoxLay->addWidget( tilingRaiseLabel, 2, 0 );
 
-    tilingRaiseCombo = new QComboBox( tilBox );
+    tilingRaiseCombo = new KComboBox( tilBox );
     tilingRaiseCombo->addItem( i18nc( "Window Raising Policy", "Raise/Lower all floating windows" ) );
     tilingRaiseCombo->addItem( i18nc( "Window Raising Policy", "Raise/Lower current window only") );
     tilingRaiseCombo->addItem( i18nc( "Window Raising Policy", "Floating windows are always on top" ) );
diff --git a/kcmkwin/kwinoptions/windows.h b/kcmkwin/kwinoptions/windows.h
index 29c73dd7e0..7bce38e6b3 100644
--- a/kcmkwin/kwinoptions/windows.h
+++ b/kcmkwin/kwinoptions/windows.h
@@ -236,8 +236,8 @@ private:
   QCheckBox *tilingOn;
   QLabel *tilingLayoutLabel;
   QLabel *tilingRaiseLabel;
-  QComboBox *tilingLayoutCombo;
-  QComboBox *tilingRaiseCombo;
+  KComboBox *tilingLayoutCombo;
+  KComboBox *tilingRaiseCombo;
   void setTilingOn( bool );
   void setTilingLayout( int );
   void setTilingRaisePolicy( int );
diff --git a/tilinglayoutfactory.cpp b/tilinglayoutfactory.cpp
index a684ebe90c..ada039a043 100644
--- a/tilinglayoutfactory.cpp
+++ b/tilinglayoutfactory.cpp
@@ -40,7 +40,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             layout = new lay( w );\
             layout->setLayoutType( lay##L );\
             KNotification::event( "tilinglayoutchanged", \
-                                i18n( "Layout changed to %1" ).arg( #lay ),\
+                                i18n( "Layout changed to %1", i18n(#lay) ),\
                                 QPixmap(), NULL, KNotification::CloseOnTimeout, KComponentData( "kwin" ) );\
             break
 
diff --git a/tilinglayouts/columns/columns.cpp b/tilinglayouts/columns/columns.cpp
index 887b23f67a..ca429a00eb 100644
--- a/tilinglayouts/columns/columns.cpp
+++ b/tilinglayouts/columns/columns.cpp
@@ -149,7 +149,7 @@ void Columns::arrange( QRect wgeom )
 
     int mult = 0;
     int originalTop = wgeom.y();
-    for( QList<Tile *>::const_iterator it = ++tiled.constBegin() ; it != tiled.constEnd() ; it++ )
+    for( QList<Tile *>::const_iterator it = ++tiled.constBegin() ; it != tiled.constEnd() ; ++it )
         {
         if( (*it)->floating() )
             continue;