Last of the changes needed for figures.