Small improvements to Chapter 7