Fixed the rest of the buildbot issues.