More format fixes