Misc tidy-up