fixes for upgrade, versions are now expressed in Int64