Miscellaneous update rollup
Additional format changes