Sonar violation fixes.
Sonar violation fixes.