Fixed Xcode 6 issues