Bunch of little things to make sonar happier.