fix scrutinizer issues