Address comments in r97628