BAT HERO: HotFix

Fixing some issues of the latest build.