Chapter 10s fixes