hero event minor fixes, header fixes