fix xcode6b6 issues.