ARC and IOS 8 fixes