Small animation fixes