DOCS-120 build fixes