Scrutinizer fixes

3.0 version