Further small tweaks