Small changes for public release.