Fixes for production bot master