Some fixes to make Scrutinizer happier