Scrutinizer fixes,