diff --git a/_sql/postgresql/create.bat b/_sql/postgresql/create.bat
index 9d9b7c40e..8cb54a0c5 100644
--- a/_sql/postgresql/create.bat
+++ b/_sql/postgresql/create.bat
@@ -1,3 +1,3 @@
-dropdb -U postgres -q quickfix
+dropdb -U postgres --if-exists quickfix
 createdb -U postgres quickfix
 psql -U postgres -d quickfix -f postgresql.sql
diff --git a/_sql/postgresql/create.sh b/_sql/postgresql/create.sh
index 9d9b7c40e..8cb54a0c5 100644
--- a/_sql/postgresql/create.sh
+++ b/_sql/postgresql/create.sh
@@ -1,3 +1,3 @@
-dropdb -U postgres -q quickfix
+dropdb -U postgres --if-exists quickfix
 createdb -U postgres quickfix
 psql -U postgres -d quickfix -f postgresql.sql
diff --git a/store/sql/sqlstore.go b/store/sql/sqlstore.go
index 91261fdcd..c54ac517f 100644
--- a/store/sql/sqlstore.go
+++ b/store/sql/sqlstore.go
@@ -118,7 +118,7 @@ func newSQLStore(sessionID quickfix.SessionID, driver string, dataSourceName str
 		return
 	}
 
-	if store.sqlDriver == "postgres" {
+	if store.sqlDriver == "postgres" || store.sqlDriver == "pgx" {
 		store.placeholder = postgresPlaceholder
 	}