Fix Xcode 5 issues