Fixes to chapter 15