Fixes for XCode 6 Beta 7.  May not work on previous versions.