More format tweaks