Minor mods as we continue to evolve towards ARC