Bufixes on animation