fixes for scrutinizer