A few fixes for animation
pre-merge