Merge "Fix some postgres test failures"