SONARJAVA-395 Minor fixes