Tweaks for psql