Fix Scrutinizer issues 3