Edits for HeroChat compatibility