Some animation fixes