Merge "Fix some doc issues." into klp-dev