Prerelease bug fixing

More fixes