Various tweaks of all sorts