Making some corrections as per Mo (#19746)