scrutinizer fixes 2