More Animation fixes