KFSQA-BA_fixes corrections from code review.