A few sonar fixes to test the process