Fixes to a few figures