Scrutinizer patches #2