Minor fixes and changes for the 3.0 release.