Fix up for roles
Merge