Final(?) tweaks to sonar setup.