Chapter 14 more fixes