Fixes in chapter 4