Fixes for internal sonar