Data modeling fixes for role sync issues. UI breakage yet.