Fix bugs for scrutinizer