More tweaks for the 2.0 release.