Final prerelease fixes