More tweaks and fixes for this release.