Merge "Minor documentation improvements"