Even more major-version-bumping fixes...