Pull in postgresql fixes