Figure 17 fixes