Minor tidying, to verify new build