Changes needed to support ARC