diff --git a/.vscodeignore b/.vscodeignore
index a426631..7180bf2 100644
--- a/.vscodeignore
+++ b/.vscodeignore
@@ -10,6 +10,27 @@ src/**
 **/*.ts
 node_modules/**
 !node_modules/pg/**
+!node_modules/pg-types/**
+!node_modules/pg-protocol/**
+!node_modules/pg-int8/**
+!node_modules/pg-pool/**
+!node_modules/pg-connection-string/**
+!node_modules/pgpass/**
+!node_modules/packet-reader/**
+!node_modules/postgres-array/**
+!node_modules/postgres-bytea/**
+!node_modules/postgres-date/**
+!node_modules/postgres-interval/**
+!node_modules/postgres-range/**
+!node_modules/split2/**
+!node_modules/xtend/**
+!node_modules/ssh2/**
+!node_modules/asn1/**
+!node_modules/bcrypt-pbkdf/**
+!node_modules/cpu-features/**
+!node_modules/nan/**
+!node_modules/tweetnacl/**
+!node_modules/safer-buffer/**
 !node_modules/vscode-languageclient/**
 !node_modules/vscode-languageserver/**
 .git/**
diff --git a/package.json b/package.json
index 5f20292..e790e52 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "postgres-explorer",
   "displayName": "PgStudio (PostgreSQL Explorer)",
-  "version": "0.6.7",
+  "version": "0.6.9",
   "description": "PostgreSQL database explorer for VS Code with notebook support",
   "publisher": "ric-v",
   "private": false,
@@ -1592,13 +1592,13 @@
   ],
   "main": "./dist/extension.js",
   "scripts": {
-    "vscode:prepublish": "npm run esbuild-base --minify && npm run esbuild-renderer --minify",
-    "esbuild-base": "esbuild ./src/extension.ts --bundle --outfile=dist/extension.js --external:vscode --external:ssh2 --format=cjs --platform=node",
+    "vscode:prepublish": "npm run esbuild-base -- --minify && npm run esbuild-renderer -- --minify",
+    "esbuild-base": "esbuild ./src/extension.ts --bundle --outfile=dist/extension.js --external:vscode --external:ssh2 --external:pg --format=cjs --platform=node --main-fields=main",
     "esbuild-renderer": "esbuild ./src/renderer_v2.ts --bundle --outfile=dist/renderer_v2.js --format=esm --platform=browser",
     "compile": "tsc -p ./ && npm run esbuild-renderer",
     "watch": "tsc -watch -p ./",
-    "esbuild": "npm run esbuild-base --sourcemap && npm run esbuild-renderer --sourcemap",
-    "esbuild-watch": "npm run esbuild-base --sourcemap --watch & npm run esbuild-renderer --sourcemap --watch",
+    "esbuild": "npm run esbuild-base -- --sourcemap && npm run esbuild-renderer -- --sourcemap",
+    "esbuild-watch": "npm run esbuild-base -- --sourcemap --watch & npm run esbuild-renderer -- --sourcemap --watch",
     "test": "ts-mocha -r src/test/setup.ts 'src/test/unit/**/*.test.ts'",
     "coverage": "nyc npm run test"
   },