3.6/ross xcode6 fixes