Fixes for chapter 4, section 2