Couple more bits of tidying