Fixed issues in Xcode6.1