Bug fixes for MCBrawl