Fixes for buildbot pt. 2