Chapter 04 fixes