Some fixes from master branch (ru)