scrutinizer fixes 1