Animate fixes