More format fixes.