Animation Performance Fixes