..various tweaks