Minor changes. CR in progress.