Fixes

Change-Id: I2b6724d9f8cc6f9d8f38bd62afba823f2bc25e14
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>