Figures 6 tweaks