ARC analysis fixes [3]