In-progress data work.
API fixes for Xcode 6.1.