two changes needed to compile for XCoder 6.1 beta 2