Fixing sonar stuff

https://www.pivotaltracker.com/story/show/82674360

Intermediate merge.