Def animation fixes