Misc cosmetic fixes.