Tweaks for #format