Chapter 09s fixes