Minor code corrections to fix deprecations and also make the project compile fine with the recent XCode 6 Beta