Animations fixes..