[MRG] Fix various buildbot failures