Sync with roxy

Not sure we want the hiding of postgresql, though?