Did some build tidy-ups.