more scrutinizer fixes