Minor tidy-ups