Minor tweaks for Sonar