Fix some Scrutinizer Issues #3