Fixed issues with Xcode 5.1.1 compiler