some minor changes for scrutinizer