release-related fixes