Fix even more scrutinizer issues