More Hero.cpp collision changes