Prerelease bugfixes