Bug fixes for the bot master