fixes from psabata

Signed-off-by: Igor Gnatenko <ignatenko@mirantis.com>