Update with Scrutinizer patches