Fix things until the end of section 6.