Fix animation problems