Convert To ARC + other fixes