SCC-101: sonar fixes