Tiny updates for sonar