[Olena-patches] 3010: Various small fixes.