Fix Scrutinizer issues 2