ARC analysis fixes [2]