Some fixes for scrutinizer