More Animation Fixes