Fix quality flaws
SONARJAVA-69 Handle properly primitive types