Misc style changes, etc.