hero-unit fixes