Fix buildbot issues