sonar and findbugs fix