HAL-2 Fixed sonar issues