Animation fixups