Fix for Xcode warnings.
Merge pull request #2060 from ey6es/master

Fix for Xcode warnings.