Tweaks to deal with ARC