Fixes made to section 3.1.4 of the design doc