Fixed compile errors reported by Xcode 4.6

Make sure to run "git submodule sync" after pulling this commit.