Fix Scrutiny to latest changes