2 files changed, 4 insertions, 4 deletions

diff --git a/src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs b/src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs
index 42f15660..f4ec17bf 100644
--- a/src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs
+++ b/src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs
@@ -51,7 +51,7 @@ namespace WixToolset.Data.Tuples
 
         public RegistryRootType Root
         {
-            get => (RegistryRootType)this.Fields[(int)RemoveRegistryTupleFields.Root]?.AsNumber();
+            get => (RegistryRootType)this.Fields[(int)RemoveRegistryTupleFields.Root].AsNumber();
             set => this.Set((int)RemoveRegistryTupleFields.Root, (int)value);
         }
 
diff --git a/src/WixToolset.Data/Tuples/WixBundleTuple.cs b/src/WixToolset.Data/Tuples/WixBundleTuple.cs
index f7cd4f23..8f6f760a 100644
--- a/src/WixToolset.Data/Tuples/WixBundleTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleTuple.cs
@@ -32,7 +32,7 @@ namespace WixToolset.Data
                 new IntermediateFieldDefinition(nameof(WixBundleTupleFields.UpgradeCode), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleTupleFields.BundleId), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleTupleFields.ProviderKey), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.PerMachine), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.PerMachine), IntermediateFieldType.Bool),
             },
             typeof(WixBundleTuple));
     }
@@ -211,9 +211,9 @@ namespace WixToolset.Data.Tuples
             set => this.Set((int)WixBundleTupleFields.ProviderKey, value);
         }
 
-        public int PerMachine
+        public bool PerMachine
         {
-            get => (int)this.Fields[(int)WixBundleTupleFields.PerMachine];
+            get => (bool)this.Fields[(int)WixBundleTupleFields.PerMachine];
             set => this.Set((int)WixBundleTupleFields.PerMachine, value);
         }
     }