Scrutinizer issues fixed