Minor bugfixes to BotClientMap