Some fixes from en branch (ru)