Some animation bug fixes.