Doc fixes

Change-Id: I689f10b1da0d147b9b3b9b1ba1ba5592fea42f23