[KFSQA-773] corrected a couple of things based on Todd comment