Tidy-ups for new build system