Some more BR-scrutinizer fixes