Some changes necessary to build in Xcode6-beta6.

These cause some warnings in Xcode 5, because the property is not `nonatomic` in that version’s copy of the SDK, but the app builds & runs.