Code fixes for Xcode 6 beta 4