More scrutinizer fixes.