Fixed sonar violation messages.