Xcode 6 Beta 6 compatibility

I just upgraded to Xcode 6 Beta 6 (from Beta 4). There were a few warnings in the code that is addressed in this commit.