[Olena-patches] 1678: Miscellaneous fixes.