More Scrutinizer fixes