Addressing scrutinizer issues