Animation fixes