Scrutinizer fixes.