8623679 Fix some doc snafus