More format fixing