Fixes for reverting back to a previous Xcode beta.

Xcode 6.1 beta 3 is too unstable.