Updated to conform to iOS Beta 4 compiler issues