Fixups to the upcoming version