Additional scrutinizer fixes