diff --git a/request-strategy/order.go b/request-strategy/order.go
index a23d5117..c276da91 100644
--- a/request-strategy/order.go
+++ b/request-strategy/order.go
@@ -53,7 +53,7 @@ func GetRequestablePieces(input Input, pro *PieceRequestOrder, f func(ih metainf
 	var allTorrentsUnverifiedBytes int64
 	pro.tree.Scan(func(_i pieceRequestOrderItem) bool {
 		ih := _i.key.InfoHash
-		var t Torrent = input.Torrent(ih)
+		var t = input.Torrent(ih)
 		pieceLength := t.PieceLength()
 		if storageLeft != nil {
 			if *storageLeft < pieceLength {
diff --git a/torrent.go b/torrent.go
index b54e8bbc..81e80ddb 100644
--- a/torrent.go
+++ b/torrent.go
@@ -463,10 +463,10 @@ func (t *Torrent) onSetInfo() {
 		}
 		p.relativeAvailability = t.selectivePieceAvailabilityFromPeers(i)
 		t.addRequestOrderPiece(i)
-		t.updatePieceCompletion(pieceIndex(i))
+		t.updatePieceCompletion(i)
 		if !t.initialPieceCheckDisabled && !p.storageCompletionOk {
 			// t.logger.Printf("piece %s completion unknown, queueing check", p)
-			t.queuePieceCheck(pieceIndex(i))
+			t.queuePieceCheck(i)
 		}
 	}
 	t.cl.event.Broadcast()