xcode 6.1 fixes