DOCS-2422: Minor fixes and adjustments