fix scrutinizer-issues