Fixes for buildbot.
Fixes for buildbot pt. 2
Merge pull request #46 from xor-xor/fix_bb

Fixes for buildbot.