More fixes for Scrutinizer