Yet more tweaks