Fixes in Egor code