Fix buildbot errors.