bug fixes to hero handling