Fixes for Xcode6-B7 Foundation changes