various minor adjustments to make Sonar happier