diff --git a/pkg/sentry/fsimpl/gofer/gofer.go b/pkg/sentry/fsimpl/gofer/gofer.go
index c3163a73a..679019aee 100644
--- a/pkg/sentry/fsimpl/gofer/gofer.go
+++ b/pkg/sentry/fsimpl/gofer/gofer.go
@@ -950,7 +950,7 @@ type dentry struct {
 	// tracks dirty segments in cache. dirty is protected by dataMu.
 	dirty fsutil.DirtySet
 
-	// pf implements platform.File for mappings of hostFD.
+	// pf implements memmap.File for mappings of hostFD.
 	pf dentryPlatformFile
 
 	// If this dentry represents a symbolic link, InteropModeShared is not in
diff --git a/pkg/sentry/fsimpl/tmpfs/tmpfs.go b/pkg/sentry/fsimpl/tmpfs/tmpfs.go
index bc4635cb3..f534b7e96 100644
--- a/pkg/sentry/fsimpl/tmpfs/tmpfs.go
+++ b/pkg/sentry/fsimpl/tmpfs/tmpfs.go
@@ -642,7 +642,6 @@ func (i *inode) statTo(stat *linux.Statx) {
 	stat.DevMinor = i.fs.devMinor
 	switch impl := i.impl.(type) {
 	case *regularFile:
-		stat.Mask |= linux.STATX_SIZE | linux.STATX_BLOCKS
 		stat.Size = uint64(impl.size.Load())
 		// TODO(jamieliu): This should be impl.data.Span() / 512, but this is
 		// too expensive to compute here. Cache it in regularFile.
diff --git a/pkg/sentry/mm/README.md b/pkg/sentry/mm/README.md
index f4d43d927..a983af5ec 100644
--- a/pkg/sentry/mm/README.md
+++ b/pkg/sentry/mm/README.md
@@ -265,7 +265,7 @@ In the sentry:
     [`memmap.Mappable.AddMapping` and `memmap.Mappable.RemoveMapping`][memmap].
 
 -   Host files that may be mapped into host VMAs are represented by type
-    [`platform.File`][platform].
+    [`memmap.File`][memmap].
 
 -   Host VMAs are represented in the sentry by type [`mm.pma`][mm] ("platform
     mapping area"), stored in `mm.MemoryManager.pmas`.
diff --git a/pkg/sentry/mm/io.go b/pkg/sentry/mm/io.go
index ef7610faa..ceb85791c 100644
--- a/pkg/sentry/mm/io.go
+++ b/pkg/sentry/mm/io.go
@@ -26,7 +26,7 @@ import (
 // There are two supported ways to copy data to/from application virtual
 // memory:
 //
-// 1. Internally-mapped copying: Determine the platform.File that backs the
+// 1. Internally-mapped copying: Determine the memmap.File that backs the
 // copied-to/from virtual address, obtain a mapping of its pages, and read or
 // write to the mapping.
 //
diff --git a/runsc/boot/vfs.go b/runsc/boot/vfs.go
index bafbb16d2..9d6d167fe 100644
--- a/runsc/boot/vfs.go
+++ b/runsc/boot/vfs.go
@@ -704,7 +704,7 @@ func (c *containerMounter) mountSubmounts(ctx context.Context, conf *config.Conf
 	}
 
 	if err := c.mountTmp(ctx, conf, creds, mns); err != nil {
-		return fmt.Errorf(`mount submount "\tmp": %w`, err)
+		return fmt.Errorf(`mount submount "/tmp": %w`, err)
 	}
 	return nil
 }