A few minor updates to get app compiling with Xcode6 beta4.