Couple of minor tidy-ups