Some fixes

Signed-off-by: Oleg Bulatov <dmage@yandex-team.ru>