Fixing sonar bugs