Minor fixes and tidy-up.