diff --git a/src/declarativeimports/calendar/calendar.h b/src/declarativeimports/calendar/calendar.h
index 5d1f39425..597fba8d9 100644
--- a/src/declarativeimports/calendar/calendar.h
+++ b/src/declarativeimports/calendar/calendar.h
@@ -14,7 +14,7 @@ class Calendar : public QObject
     Q_OBJECT
     Q_PROPERTY(QDate startDate READ startDate WRITE setStartDate NOTIFY startDateChanged)
     Q_PROPERTY(int types READ types WRITE setTypes NOTIFY typesChanged)
-     Q_PROPERTY(QList<int> weeksModel READ weeksModel NOTIFY startDateChanged CONSTANT)
+    Q_PROPERTY(QList<int> weeksModel READ weeksModel CONSTANT)
     Q_PROPERTY(int days READ days WRITE setDays NOTIFY daysChanged)
     Q_PROPERTY(int weeks READ weeks WRITE setWeeks NOTIFY weeksChanged)
     Q_PROPERTY(int startDay READ startDay WRITE setStartDay NOTIFY startDayChanged)
diff --git a/src/declarativeimports/core/dialog.cpp b/src/declarativeimports/core/dialog.cpp
index 4f1d9c8d9..3731db059 100644
--- a/src/declarativeimports/core/dialog.cpp
+++ b/src/declarativeimports/core/dialog.cpp
@@ -60,7 +60,7 @@ QString locString(const Plasma::Types::Location l) {
 }
 
 DialogProxy::DialogProxy(QQuickItem *parent)
-    : QQuickWindow(),
+    : QQuickWindow(parent ? parent->window() : 0),
       m_location(Plasma::Types::TopEdge),
       m_activeWindow(false)
 {
diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.cpp b/src/scriptengines/qml/plasmoid/containmentinterface.cpp
index d7438506c..f715f7ddf 100644
--- a/src/scriptengines/qml/plasmoid/containmentinterface.cpp
+++ b/src/scriptengines/qml/plasmoid/containmentinterface.cpp
@@ -191,15 +191,15 @@ Plasma::Applet *ContainmentInterface::addApplet(const QString &plugin, const QVa
     blockSignals(true);
     Plasma::Applet *applet = containment()->createApplet(plugin, args);
 
-    QObject *appletGraphicObject;
+
     if (applet) {
-        appletGraphicObject = applet->property("graphicObject").value<QObject *>();
+        QObject *appletGraphicObject = applet->property("graphicObject").value<QObject *>();
+
+        blockSignals(false);
+
+        emit appletAdded(appletGraphicObject, pos.x(), pos.y());
+        emit appletsChanged();
     }
-
-    blockSignals(false);
-
-    emit appletAdded(appletGraphicObject, pos.x(), pos.y());
-    emit appletsChanged();
     return applet;
 }
 
diff --git a/src/shell/desktopview.cpp b/src/shell/desktopview.cpp
index 8eda4be9b..90a573005 100644
--- a/src/shell/desktopview.cpp
+++ b/src/shell/desktopview.cpp
@@ -78,7 +78,7 @@ void DesktopView::setFillScreen(bool fillScreen)
     resize(screen()->geometry().width(), screen()->geometry().height());
     connect(screen(), &QScreen::geometryChanged, [=]{resize(screen()->geometry().width(), screen()->geometry().height());});
 
-    fillScreen = fillScreen;
+    m_fillScreen = fillScreen;
     emit fillScreenChanged();
 }