More scrutinizer fixes