diff --git a/jslib b/jslib
index 9fa99f3a6e..0d30a1a1c9 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 9fa99f3a6ecf7c4a14e5d7271562b3908cf64728
+Subproject commit 0d30a1a1c9bd2c323189069fe4ec233ab85c35fe
diff --git a/src/app/services.module.ts b/src/app/services.module.ts
index 7503837ab3..6783358f3e 100644
--- a/src/app/services.module.ts
+++ b/src/app/services.module.ts
@@ -95,7 +95,7 @@ const userService = new UserService(tokenService, storageService);
 const settingsService = new SettingsService(userService, storageService);
 export let searchService: SearchService = null;
 const cipherService = new CipherService(cryptoService, userService, settingsService,
-    apiService, storageService, i18nService, platformUtilsService, () => searchService);
+    apiService, storageService, i18nService, () => searchService);
 const folderService = new FolderService(cryptoService, userService, apiService, storageService,
     i18nService, cipherService);
 const collectionService = new CollectionService(cryptoService, userService, storageService, i18nService);
@@ -107,7 +107,7 @@ const syncService = new SyncService(userService, apiService, settingsService,
     async (expired: boolean) => messagingService.send('logout', { expired: expired }));
 const passwordGenerationService = new PasswordGenerationService(cryptoService, storageService);
 const totpService = new TotpService(storageService, cryptoFunctionService);
-const containerService = new ContainerService(cryptoService, platformUtilsService);
+const containerService = new ContainerService(cryptoService);
 const authService = new AuthService(cryptoService, apiService,
     userService, tokenService, appIdService, i18nService, platformUtilsService, messagingService);
 const exportService = new ExportService(folderService, cipherService, apiService);
@@ -117,7 +117,7 @@ const notificationsService = new NotificationsService(userService, syncService,
 const environmentService = new EnvironmentService(apiService, storageService, notificationsService);
 
 const analytics = new Analytics(window, () => isDev(), platformUtilsService, storageService, appIdService);
-containerService.attachToWindow(window);
+containerService.attachToGlobal(window);
 
 export function initFactory(): Function {
     return async () => {
diff --git a/tsconfig.json b/tsconfig.json
index 71c1076d6a..1a4327365b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,6 +11,9 @@
     "types": [],
     "baseUrl": ".",
     "paths": {
+      "tldjs": [
+        "jslib/src/misc/tldjs.noop"
+      ],
       "jslib/*": [
         "jslib/src/*"
       ],