diff --git a/src/plasma/corona.cpp b/src/plasma/corona.cpp
index adcdeb197..47338730d 100644
--- a/src/plasma/corona.cpp
+++ b/src/plasma/corona.cpp
@@ -507,7 +507,6 @@ QList<Plasma::Containment *> CoronaPrivate::importLayout(const KConfigGroup &con
     }
 
     foreach (Containment *containment, newContainments) {
-        containment->updateConstraints(Plasma::Types::StartupCompletedConstraint);
         emit q->containmentAdded(containment);
 #ifndef NDEBUG
 //         kDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "Containment" << containment->name();
diff --git a/src/shell/qmlpackages/desktop/contents/defaults b/src/shell/qmlpackages/desktop/contents/defaults
index 147d0ec4e..b9a99dab4 100644
--- a/src/shell/qmlpackages/desktop/contents/defaults
+++ b/src/shell/qmlpackages/desktop/contents/defaults
@@ -7,7 +7,7 @@ MiddleButton=org.kde.paste
  
 [Panel]
 Containment=org.kde.panel
-ToolBox=org.kde.toolbox
+ToolBox=org.kde.paneltoolbox
 [Panel][ContainmentActions]
 Ctrl;LeftButton=org.kde.standardmenu