More Sonar warnings dealt with.