Fixed issues that came with Xcode 6 Beta6