Sonar issues gefixed