Merge "A few doc comment fixups"