A few final tidy-ups