Prerelease tweaks, to make pip install succeed