[2443] Minor changes during the course of the review