More scrutinizer patches