A bunch of ARC changes