Fixed issues with bots