More minor tidy-ups