Some fixes around the animation