Misc formatting corrections