Few minor fixes [KFSQA-593]