More tweaks based on sonar