Some minor changes for postgres