FIXES for Sonar