Scrutinizer fixes [ci skip]