diff --git a/flake.nix b/flake.nix
index 5115f03..ab24bf4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,14 +54,22 @@
 
       packages.${system} = {
         ${name} = oms; # nixpkgs.legacyPackages.${system}.${name};
-        mkOauth2DB = pkgs.writeScriptBin "mkOauth2DB" ''
-          #!${pkgs.zsh}/bin/zsh -e
-          ${mkDB}
-        '';
-        killOauth2DB = pkgs.writeScriptBin "killOauth2DB" ''
-          #!${pkgs.zsh}/bin/zsh -e
-          ${killDB}
-        '';
+        mkOauth2DB = pkgs.writeShellApplication {
+          name = "mkOauth2DB";
+          runtimeInputs = [ pkgs.postgresql_16 ];
+          text = ''
+            #!${pkgs.zsh}/bin/zsh -e
+            ${mkDB}
+          '';
+        };
+        killOauth2DB = pkgs.writeShellApplication { 
+          name = "killOauth2DB";
+          runtimeInputs = [ pkgs.postgresql_16 ];
+          text = ''
+            #!${pkgs.zsh}/bin/zsh -e
+            ${killDB}
+          '';
+        };
         default = self.packages.${system}.${name};
       };
 
diff --git a/mkDB.sh b/mkDB.sh
index 16330e4..0a44419 100755
--- a/mkDB.sh
+++ b/mkDB.sh
@@ -22,7 +22,7 @@ pgLogFile=$(mktemp --tmpdir="${absdir}" postgresql.XXXXXX.log)
 
 initdb --no-locale -D "${pgDir}"
 pg_ctl start -D "${pgDir}" -l "${pgLogFile}" -w -o "-k ${pgSockDir} -c listen_addresses='::' -c hba_file='${OAUTH2_HBA}' -p ${OAUTH2_DB_PORT} -h localhost -c unix_socket_permissions=0700 -c max_connections=10 -c session_preload_libraries=auto_explain -c auto_explain.log_min_duration=100ms"
-psql -h "${pgSockDir}" -p ${OAUTH2_DB_PORT} -f ${OAUTH2_DB_SCHEMA} postgres
+psql -h "${pgSockDir}" -p ${OAUTH2_DB_PORT} -f "${OAUTH2_DB_SCHEMA}" postgres
 
 printf "Postgres logfile is %s\nPostgres socket directory is %s\n" "${pgLogFile}" "${pgSockDir}"