Animations fixes