Fix scrutinizer issues