Addressed some buildbot errors and comments on the checkin by Antoine on python-dev.