KFSQA-643 made corrections per Kyle's review