scrutinizer fixes