Fixed some bugs.
Support for old buildbot.