Fix latest scrutinizer bugs