Don't pass password to postgresql user
Fix flatten