Fixing sonar bugs.