minor Gachka fixes