Fixes to animations