Chapter 10 fixes