More vertica6 compatibility changes