Fixes to make new bots work without errors