Small scrutinizer fixes