Misc format changes.