Fixing system-level role assignments