Fixing scrutinizer issues