Some little fixes for chapter 6.