Bug fixes for Xcode6 Beta-4