Fixed issues with some animations not working