Merge "Minor edits."