More fig tweaks