More work on hero animation issues.