Minor edits reflecting recent changes