Animation stop improvements