diff --git a/cortex-js/src/index.ts b/cortex-js/src/index.ts
index 24dfa6d73..092876409 100644
--- a/cortex-js/src/index.ts
+++ b/cortex-js/src/index.ts
@@ -82,6 +82,7 @@ async function startServer(dataFolderPath?: string) {
       dataFolderPath: dataFolderPath || config.dataFolderPath,
       cortexCppPort: enginePort,
     });
+    return app;
   } catch (e) {
     console.error(e);
     // revert the data folder path if it was set
diff --git a/cortex-js/src/usecases/engines/engines.usecase.ts b/cortex-js/src/usecases/engines/engines.usecase.ts
index ab9bbaa02..ac0b22383 100644
--- a/cortex-js/src/usecases/engines/engines.usecase.ts
+++ b/cortex-js/src/usecases/engines/engines.usecase.ts
@@ -93,15 +93,17 @@ export class EnginesUsecases {
         engine === Engines.llamaCPP &&
         (options?.vulkan ||
           (options?.runMode === 'GPU' && options?.gpuType !== 'Nvidia'));
+      const platformMatcher =
+        process.platform === 'win32'
+          ? '-windows'
+          : process.platform === 'darwin'
+            ? '-mac'
+            : '-linux';
       installPackages.push(
         this.installAcceleratedEngine(options?.version ?? 'latest', engine, [
-          process.platform === 'win32'
-            ? '-windows'
-            : process.platform === 'darwin'
-              ? '-mac'
-              : '-linux',
+          platformMatcher,
           // CPU Instructions - CPU | GPU Non-Vulkan
-          !isVulkan && engine === Engines.llamaCPP
+          !isVulkan && engine === Engines.llamaCPP && platformMatcher !== '-mac'
             ? `-noavx`
             : '',
           // Cuda