Fixes on animation