Tweaks to figures