Some scrutinizer fixes