diff --git a/api/test/ccupgrade.go b/api/test/ccupgrade.go
index 130b55cb8..b281f30a0 100644
--- a/api/test/ccupgrade.go
+++ b/api/test/ccupgrade.go
@@ -85,6 +85,7 @@ func TestCCUpgrade(t *testing.T, b APIBuilder, blocktime time.Duration) {
 	{
 		exp, err := client.StateSectorExpiration(ctx, maddr, CC, types.EmptyTSK)
 		require.NoError(t, err)
+		require.NotNil(t, exp)
 		require.Greater(t, 50000, int(exp.OnTime))
 	}
 	{
diff --git a/chain/actors/builtin/miner/v0.go b/chain/actors/builtin/miner/v0.go
index 9f4cea6ce..e0ae2594a 100644
--- a/chain/actors/builtin/miner/v0.go
+++ b/chain/actors/builtin/miner/v0.go
@@ -65,7 +65,7 @@ func (s *v0State) FindSector(num abi.SectorNumber) (*SectorLocation, error) {
 // If the sector isn't found or has already been terminated, this method returns
 // nil and no error. If the sector does not expire early, the Early expiration
 // field is 0.
-func (s *v0State) GetSectorExpiration(num abi.SectorNumber) (out *SectorExpiration, err error) {
+func (s *v0State) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, error) {
 	dls, err := s.State.LoadDeadlines(s.store)
 	if err != nil {
 		return nil, err
@@ -77,6 +77,7 @@ func (s *v0State) GetSectorExpiration(num abi.SectorNumber) (out *SectorExpirati
 	// 2. If it's faulty, it will expire early within the first 14 entries
 	// of the expiration queue.
 	stopErr := errors.New("stop")
+	out := SectorExpiration{}
 	err = dls.ForEach(s.store, func(dlIdx uint64, dl *v0miner.Deadline) error {
 		partitions, err := dl.PartitionsArray(s.store)
 		if err != nil {
@@ -97,7 +98,7 @@ func (s *v0State) GetSectorExpiration(num abi.SectorNumber) (out *SectorExpirati
 				return stopErr
 			}
 
-			q, err := v0miner.LoadExpirationQueue(s.store, part.EarlyTerminated, quant)
+			q, err := v0miner.LoadExpirationQueue(s.store, part.ExpirationsEpochs, quant)
 			if err != nil {
 				return err
 			}
@@ -128,7 +129,7 @@ func (s *v0State) GetSectorExpiration(num abi.SectorNumber) (out *SectorExpirati
 	if out.Early == 0 && out.OnTime == 0 {
 		return nil, nil
 	}
-	return out, nil
+	return &out, nil
 }
 
 func (s *v0State) GetPrecommittedSector(num abi.SectorNumber) (*SectorPreCommitOnChainInfo, error) {
@@ -294,14 +295,14 @@ func (d *v0Deadline) ForEachPartition(cb func(uint64, Partition) error) error {
 	})
 }
 
-func (s *v0Deadline) PartitionsChanged(other Deadline) bool {
+func (d *v0Deadline) PartitionsChanged(other Deadline) bool {
 	v0other, ok := other.(*v0Deadline)
 	if !ok {
 		// treat an upgrade as a change, always
 		return true
 	}
 
-	return s.Deadline.Partitions.Equals(v0other.Deadline.Partitions)
+	return d.Deadline.Partitions.Equals(v0other.Deadline.Partitions)
 }
 
 func (d *v0Deadline) PostSubmissions() (bitfield.BitField, error) {
diff --git a/chain/events/state/predicates_test.go b/chain/events/state/predicates_test.go
index 243d8814e..0412c6421 100644
--- a/chain/events/state/predicates_test.go
+++ b/chain/events/state/predicates_test.go
@@ -398,8 +398,8 @@ func TestMinerSectorChange(t *testing.T) {
 	require.NoError(t, err)
 
 	api := newMockAPI(bs)
-	api.setActor(oldState.Key(), &types.Actor{Head: oldMinerC})
-	api.setActor(newState.Key(), &types.Actor{Head: newMinerC})
+	api.setActor(oldState.Key(), &types.Actor{Head: oldMinerC, Code: v0builtin.StorageMinerActorCodeID})
+	api.setActor(newState.Key(), &types.Actor{Head: newMinerC, Code: v0builtin.StorageMinerActorCodeID})
 
 	preds := NewStatePredicates(api)