SONAR-4397 Minor labels fixes