1. AnimatedEntrace fixes