More changes from Committee review. This checkin corresponds to