Code review fixes:
- SIErrorMarkingView first iteration fixes