Bug fixes in preparation for release version.