More documentation fixes

Change-Id: I37e828636d55abc26d6645db80fcf527b02e93a3