Fix a few doc issues with last merge.