Partial fix for role assignment interface bugs