changes to handle xcode 6 beta 6