Tweaks to chapters 20 and 21