Some fixes with animation.