Misc edits.