Minor other edits