fixed scrutinizer issues