Changes suggested by Sonar