Tweaks based on sonar