Tie up some FIXMEs in Chapter 21