Even more animation fixes