KFSQA-791 corrected issues reported by Kyle in Code Review.