More make-it-build changes.