Bug fix for clips and demo avatars