Fix some postgres test failures