[Olena-patches] 1988: Misc. morpho-related fixes.