Fixing for v1.0 release.