Fixed Sonar recommendations