Minor changes to make sure section 2 ends nicely