Updates for beta 5

Made changes so that the code now compiles with Xcode6-Beta5.