Resolve some issuies with new documentation

Change-Id: Iddfabe30dd869cf24e14b27e9e02c97fb29acd2a