Small tidy-ups, nothing major