Fix Xcode6 warnings

Update suggestions made by Xcode6 to fix compilation warning.