misc sonar fixes