Fix some more scrutinizer errors