misc fixes

Signed-off-by: Ilya Eliseev <ie@e-ise.com>