last-minute fixes before release candidate