Fix some Scrutinizer issues