Major collection of sonar fixes. 92.7% RC