[KFSQA-839] Fixed issues brought up during review.