Fix rights mapping