Apply patches suggested by Scrutinizer