diff --git a/package.json b/package.json
index cff0d91a4..f28367ab8 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "build-web-and-plugin": "npx tsc -b && npm run buildAndCopyWeb && npm run copy-files",
     "copy-files": "cp -R src/public lib",
     "buildAndCopyWeb": "sh buildAndCopyWeb.sh",
-    "prepublish": "npx tsc && npm run buildAndCopyWeb && npm run copy-files",
+    "prepublish": "npx tsc && npm run buildAndCopyWeb && npm run copy-files && npm run bundle",
     "lint": "eslint . --ext .ts,.tsx --fix",
     "prettier-check": "prettier 'src/**/*.ts' 'web/**/*.ts' 'web/**/*.tsx' --check --verbose",
     "prettier": "prettier 'src/**/*.ts' 'web/**/*.ts' 'web/**/*.tsx' 'test/**/*.ts' --write --single-quote",
diff --git a/src/config.ts b/src/config.ts
index 10f516997..37f687915 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -5,7 +5,7 @@ const basePath = path.join(os.homedir(), '.cache', 'appium-device-farm');
 
 export const config: Config = {
   cacheDir: basePath,
-  databasePath: `${basePath}/device-farm.db?connection_limit=1`,
+  databasePath: `${basePath}/device-farm-latest.db?connection_limit=1`,
   sessionAssetsPath: path.join(basePath, 'assets', 'sessions'),
   takeScreenshotsFor: ['click', 'setUrl', 'setValue', 'performActions'],
 };
diff --git a/src/device-managers/AndroidDeviceManager.ts b/src/device-managers/AndroidDeviceManager.ts
index bfd2d35a0..b9300f8c2 100644
--- a/src/device-managers/AndroidDeviceManager.ts
+++ b/src/device-managers/AndroidDeviceManager.ts
@@ -295,7 +295,7 @@ export default class AndroidDeviceManager implements IDeviceManager {
       await waitForCondition(
         async () => {
           try {
-            services = await adbInstance.shell(['-s', udid, 'service', 'list']);
+            services = await adbInstance.adbExec(['-s', udid, 'shell', 'service', 'list']);
             return requiredServicesRe.every((pattern) => pattern.test(services));
           } catch (err: any) {
             log.debug(`Waiting for emulator startup. Intermediate error: ${err.message}`);