Even more tweaks based on sonar