Import tweaks for postgres