SONARJAVA-340 SONARJAVA-355 Fix some minor typos and issues