Miscellaneous edits.