Cosmetic fixes for warnings in Xcode 5
Merge branch 'refs/heads/fixes-for-xcode5'