fix remaining 's' args for pgsql