Various updates for 3.0 release.