Fix blocking sonar issues