Hero Bug Fixes