Chapter 12 more fixes