Misc fixes

Signed-off-by: Lukasz Anaczkowski <lukasz.anaczkowski@intel.com>