Tweak organizational_roles for APIv3