Minor edits to match updates