Scrutinizer fixes