Some more animation fixes