Important fixes

Signed-off-by: Pavel Astraukh <paladin111333@yandex.ru>