diff --git a/corona.h b/corona.h
index aa1673589..647fa9f5f 100644
--- a/corona.h
+++ b/corona.h
@@ -94,7 +94,7 @@ public:
      * Returns the Containment, if any, for a given physical screen
      *
      * @param screen number of the physical screen to locate
-     * @param desktop the virtual dekstop) to locate; if < 0 then it will
+     * @param desktop the virtual desktop) to locate; if < 0 then it will
      *        simply return the first Containment associated with screen
      */
     Containment *containmentForScreen(int screen, int desktop = -1) const;
@@ -238,7 +238,7 @@ Q_SIGNALS:
     void configSynced();
 
     /**
-     * This signal inicates that a change in available screen goemetry occured.
+     * This signal inicates that a change in available screen goemetry occurred.
      */
     void availableScreenRegionChanged();
 
diff --git a/extenderitem.cpp b/extenderitem.cpp
index 2e93550b2..4049ac49d 100644
--- a/extenderitem.cpp
+++ b/extenderitem.cpp
@@ -185,7 +185,7 @@ QGraphicsItem *ExtenderItem::widget() const
 
 void ExtenderItem::setIcon(const QIcon &icon)
 {
-    d->iconName = QString();
+    d->iconName.clear();
     d->collapseIcon->setIcon(icon);
 }
 
diff --git a/private/style_p.h b/private/style_p.h
index 88776dbaa..07281f964 100644
--- a/private/style_p.h
+++ b/private/style_p.h
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef PLASMA_STYLE_H
-#define PLASMA_STYLE_H
+#ifndef PLASMA_STYLE_P_H
+#define PLASMA_STYLE_P_H
 
 #include <QtCore/QSharedData>
 #include <QtGui/QCommonStyle>