[Olena-patches] cleanup-2008 2912: Little fixes.