Upgraded to XCode Beta 3 which required a few changes.