ARC analysis fixes