More style fixes for Sonar