Fixes to chapter 2.