Scrutinizer proposed fixes