Arc updates

Pulled the latest from master on the parent repo, which has some fixes for ARC as well.