Some more tidying of logging changes to reduce diff in PR