[Olena-patches] last-svn-commit-668-g9873b78 Compilation fixes.