diff --git a/build/params_2k.go b/build/params_2k.go
index a86f8a83361..16fda313d6b 100644
--- a/build/params_2k.go
+++ b/build/params_2k.go
@@ -61,9 +61,9 @@ var UpgradeSharkHeight = abi.ChainEpoch(-20)
 
 var UpgradeHyggeHeight = abi.ChainEpoch(-21)
 
-var UpgradeLightningHeight = 30
+var UpgradeLightningHeight = abi.ChainEpoch(30)
 
-var UpgradeThunderHeight = 1000
+var UpgradeThunderHeight = abi.ChainEpoch(1000)
 
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,
diff --git a/build/params_butterfly.go b/build/params_butterfly.go
index f942a67dd27..64b198bbbc0 100644
--- a/build/params_butterfly.go
+++ b/build/params_butterfly.go
@@ -19,7 +19,7 @@ var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,
 }
 
-const GenesisNetworkVersion = network.Version17
+const GenesisNetworkVersion = network.Version18
 
 var NetworkBundle = "butterflynet"
 var BundleOverrides map[actorstypes.Version]string
@@ -50,8 +50,8 @@ const UpgradeHyperdriveHeight = -16
 const UpgradeChocolateHeight = -17
 const UpgradeOhSnapHeight = -18
 const UpgradeSkyrHeight = -19
-const UpgradeSharkHeight = abi.ChainEpoch(-20)
-const UpgradeHyggeHeight = abi.ChainEpoch(-21)
+const UpgradeSharkHeight = -20
+const UpgradeHyggeHeight = -21
 
 const UpgradeLightningHeight = 20
 
diff --git a/chain/consensus/filcns/upgrades.go b/chain/consensus/filcns/upgrades.go
index b6b2291140c..7b1461636ea 100644
--- a/chain/consensus/filcns/upgrades.go
+++ b/chain/consensus/filcns/upgrades.go
@@ -1780,7 +1780,7 @@ func upgradeActorsV11Common(
 
 	if stateRoot.Version != types.StateTreeVersion5 {
 		return cid.Undef, xerrors.Errorf(
-			"expected state root version 4 for actors v11 upgrade, got %d",
+			"expected state root version 5 for actors v11 upgrade, got %d",
 			stateRoot.Version,
 		)
 	}