Fix some Scrutinizer Issues #4