Minor fixes

Various minor formatting fixes.