Sonar issues resolved