Fix some Scrutinizer Issues #5