Fix animation issues