Changes suggested by sonar