ARC compatibility fixes