Merge "Fix postgres startup"