Some fixes

Signed-off-by: 'kiyanov' <'kiyanov.alex@gmail.com'>