Some minor tweaks following on from some testing.