[Olena-patches] last-svn-commit-830-g9cfcb85 Various fixes in Scribo.