Misc formatting fixes.