Minor changes for ARC