Making some final fixes before the release.