Major Sonar issues fixes