More fixes for Xcode 6.1

Fixed Apple Mach-0 compile error