Misc format changes