Fix Scrutinizer issues