fixing scrutinizer issues