Build cleanup, make the pull request pass the automatic tests.