iOS 8 table of contents fixes.

Change-Id: I46a34d3f7e01c14c5a1501b14afa65a0bf7fa7f2