Fixes in chapter 2