diff --git a/pkg/sentry/fsimpl/devtmpfs/devtmpfs.go b/pkg/sentry/fsimpl/devtmpfs/devtmpfs.go
index e6fe0fc0d..daff40cd5 100644
--- a/pkg/sentry/fsimpl/devtmpfs/devtmpfs.go
+++ b/pkg/sentry/fsimpl/devtmpfs/devtmpfs.go
@@ -36,7 +36,7 @@ const Name = "devtmpfs"
 //
 // +stateify savable
 type FilesystemType struct {
-	initOnce sync.Once `state:"nosave"` // FIXME(gvisor.dev/issue/1664): not yet supported.
+	initOnce sync.Once `state:"nosave"` // FIXME(gvisor.dev/issue/1663): not yet supported.
 	initErr  error
 
 	// fs is the tmpfs filesystem that backs all mounts of this FilesystemType.
diff --git a/pkg/sentry/socket/netfilter/targets.go b/pkg/sentry/socket/netfilter/targets.go
index e94aceb92..fa5456eee 100644
--- a/pkg/sentry/socket/netfilter/targets.go
+++ b/pkg/sentry/socket/netfilter/targets.go
@@ -564,7 +564,7 @@ func (*snatTargetMakerV6) unmarshal(buf []byte, filter stack.IPHeaderFilter) (ta
 	buf = buf[linux.SizeOfXTEntryTarget:nfNATMarshalledSize]
 	natRange.UnmarshalUnsafe(buf)
 
-	// TODO(gvisor.dev/issue/5689): Support port or address ranges.
+	// TODO(gvisor.dev/issue/5697): Support port or address ranges.
 	if natRange.MinAddr != natRange.MaxAddr {
 		nflog("snatTargetMakerV6: MinAddr and MaxAddr are different")
 		return nil, syserr.ErrInvalidArgument
diff --git a/tools/github/reviver/github.go b/tools/github/reviver/github.go
index d9773500e..b360f0544 100644
--- a/tools/github/reviver/github.go
+++ b/tools/github/reviver/github.go
@@ -92,7 +92,7 @@ func (b *GitHubBugger) Activate(todo *Todo) (bool, error) {
 	fmt.Fprintln(&comment, "There are TODOs still referencing this issue:")
 	for _, l := range todo.Locations {
 		fmt.Fprintf(&comment,
-			"1. [%s:%d](https://github.com/%s/%s/blob/HEAD/%s#%d): %s\n",
+			"1. [%s:%d](https://github.com/%s/%s/blob/HEAD/%s#L%d): %s\n",
 			l.File, l.Line, b.owner, b.repo, l.File, l.Line, l.Comment)
 	}
 	fmt.Fprintf(&comment,