Some fixes to animation