Set of Sonar fixes