Chapter 6 little fixes.