SONAR-3755 minor comments