add a few changes to keep pgadmin3 from whining