More format string compatability changes.