Some scrutinizer issues fix