Fixes

Signed-off-by: Alex Saskevich <alexhomel@ya.ru>