More checks for scrutinizer