More ARC fixes.