Chapter 09 code review fixes