Small improvements to Chapter 8