CORE-4716: some documentation fixes