Some fixups for animation