[WIP] Fix various buildbot failures