Fixes for animations