Chapter 3 fixes