Fixed some animations issues