fix issues with Xcode 6.1