[KFSQA-677] a couple of minor changes