Accommodating changes in latest postgres modules