More Sonar violation fixes (previous comment said solar not sonar)