Chapter 08 fixes