Fix scrutinizer bugs