Fix up roles