prerelease qa fixes