Fix bugs
Related to yandex-sysmon/gns#125