Merge "Postgres installation fixes"