diff --git a/unix/mkpost.go b/unix/mkpost.go
index 4c191f01..ca6b431c 100644
--- a/unix/mkpost.go
+++ b/unix/mkpost.go
@@ -72,7 +72,7 @@ func main() {
 		b = removeFieldsRegex.ReplaceAll(b, []byte("_"))
 
 		// Remove padding, hidden, or unused fields
-		removeFieldsRegex = regexp.MustCompile(`X_\S+`)
+		removeFieldsRegex = regexp.MustCompile(`\bX_\S+`)
 		b = removeFieldsRegex.ReplaceAll(b, []byte("_"))
 	}
 
diff --git a/unix/ztypes_linux_s390x.go b/unix/ztypes_linux_s390x.go
index c064b3b1..8f4edcde 100644
--- a/unix/ztypes_linux_s390x.go
+++ b/unix/ztypes_linux_s390x.go
@@ -702,9 +702,9 @@ const (
 	AT_NO_AUTOMOUNT = 0x800
 	AT_REMOVEDIR    = 0x200
 
-	AT_STAT_ = 0x0
-	AT_STAT_ = 0x2000
-	AT_STAT_ = 0x4000
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
 
 	AT_SYMLINK_FOLLOW   = 0x400
 	AT_SYMLINK_NOFOLLOW = 0x100