Few more minor prerelease changes