Some fixies for scrutinizer