Fixed a bit more Postgre-magic