Move unique_ptr check to mp.
Don't use flush as the output may be redirected.
Update buildbot config.