XCode6 / iOS8 Beta5 Fixes

Minor changes for XCode6 / iOS8  Beta5