Fix scrutinizer issues (2)