Address some bug issues in Scrutinizer