Yet more minor tweaks