A few minor fixes to pleae Scrutinizer