Fixes for animation stuff