Fixes for animation generation.