Fixes to images and figures