Fixes for scrutinizer