diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php
index 0314b06b84..9139dd5624 100644
--- a/apps/theming/lib/ThemingDefaults.php
+++ b/apps/theming/lib/ThemingDefaults.php
@@ -23,14 +23,11 @@
 namespace OCA\Theming;
 
 
-
-
 use OCP\IConfig;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\Files\IRootFolder;
 
-
 class ThemingDefaults extends \OC_Defaults {
 
 	/** @var IConfig */
@@ -57,6 +54,7 @@ class ThemingDefaults extends \OC_Defaults {
 	 * @param IL10N $l
 	 * @param IURLGenerator $urlGenerator
 	 * @param \OC_Defaults $defaults
+	 * @param IRootFolder $rootFolder
 	 */
 	public function __construct(IConfig $config,
 								IL10N $l,
diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php
index 0aa88c3115..ffa6810ffd 100644
--- a/apps/theming/tests/ThemingDefaultsTest.php
+++ b/apps/theming/tests/ThemingDefaultsTest.php
@@ -78,8 +78,6 @@ class ThemingDefaultsTest extends TestCase {
 			$this->defaults,
 			$this->rootFolder
 		);
-
-		//return parent::setUp();
 	}
 
 	public function testGetNameWithDefault() {
diff --git a/lib/private/Server.php b/lib/private/Server.php
index 02419e9a5e..e99c6e8c56 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -656,7 +656,7 @@ class Server extends ServerContainer implements IServerContainer {
 					$c->getL10N('theming'),
 					$c->getURLGenerator(),
 					new \OC_Defaults(),
-					$c->getRootFolder()
+					$c->getLazyRootFolder()
 				);
 			}
 			return new \OC_Defaults();