Further minor tweaks