Fixed existing errors on buildbot of previous runs