more Scrutinizer fixes