Fixed some animation issues