diff --git a/loader/app/targets/certaccept.ts b/loader/app/targets/certaccept.ts
index 21a7e20d..b64d93e6 100644
--- a/loader/app/targets/certaccept.ts
+++ b/loader/app/targets/certaccept.ts
@@ -24,10 +24,10 @@ const loader_javascript = {
     },
 
     load_scripts: async () => {
-        await loader.load_script(["vendor/jquery/jquery.min.js"]);
-        await loader.load_scripts([
+        await loader.scripts.load_multiple(["vendor/jquery/jquery.min.js"], {});
+        await loader.scripts.load_multiple([
             ["dist/certificate-popup.js"],
-        ]);
+        ], {});
     }
 };
 
@@ -41,15 +41,15 @@ const loader_style = {
     },
 
     load_style_debug: async () => {
-        await loader.load_styles([
+        await loader.style.load_multiple([
             "css/static/main.css",
-        ]);
+        ], {});
     },
 
     load_style_release: async () => {
-        await loader.load_styles([
+        await loader.style.load_multiple([
             "css/static/main.css",
-        ]);
+        ], {});
     }
 };
 
@@ -92,4 +92,6 @@ loader.register_task(loader.Stage.INITIALIZING, {
 if(!loader.running()) {
     /* we know that we want to load the app */
     loader.execute_managed();
-}
\ No newline at end of file
+}
+
+export = {};
\ No newline at end of file
diff --git a/shared/popup/certaccept/js/main.ts b/shared/popup/certaccept/js/main.ts
index 2d9abd48..26722822 100644
--- a/shared/popup/certaccept/js/main.ts
+++ b/shared/popup/certaccept/js/main.ts
@@ -2,7 +2,7 @@ import {settings, Settings} from "tc-shared/settings";
 import * as loader from "tc-loader";
 import * as log from "tc-shared/log";
 import {LogCategory} from "tc-shared/log";
-import * as bipc from "tc-shared/BrowserIPC";
+import * as bipc from "tc-shared/ipc/BrowserIPC";
 
 const is_debug = false; //TODO: Sync with loader!
 function tr(text: string) { return text; }
@@ -20,7 +20,7 @@ loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
 
         log.info(LogCategory.IPC, tr("Using this instance as certificate callback. ID: %s"), certificate_accept);
         try {
-            await bipc.get_handler().post_certificate_accpected(certificate_accept);
+            await bipc.getInstance().post_certificate_accpected(certificate_accept);
             log.info(LogCategory.IPC, tr("Other instance has acknowledged out work. Closing this window."));
 
             let seconds = 5;