fixed xcode6 warnings