--- exprep.c-	Fri Nov  9 11:10:28 2001
+++ exprep.c	Fri Nov  9 16:16:40 2001
@@ -304,7 +304,7 @@
     /*
      * StartFieldBitOffset is the offset of the first bit of the field within a field datum.
      */
-    ObjDesc->CommonField.StartFieldBitOffset  = (UINT8) (FieldBitPosition % AccessBitWidth);
+    ObjDesc->CommonField.StartFieldBitOffset  = (UINT8) (FieldBitPosition - ObjDesc->CommonField.BaseByteOffset * 8);
 
     /*
      * Valid bits -- the number of bits that compose a partial datum,
--- dsmthdat.c-	Thu Nov  8 03:59:20 2001
+++ dsmthdat.c	Fri Nov  9 14:55:29 2001
@@ -713,13 +713,13 @@
 
             /* Detach an existing object from the Node */
 
-            AcpiNsDetachObject (Node);
+            AcpiNsDetachObject ((ACPI_NAMESPACE_NODE *)Node->Object);
 
             /*
              * Store this object into the Node
              * (perform the indirect store)
              */
-            Status = AcpiNsAttachObject (Node, ObjDesc, ObjDesc->Common.Type);
+            Status = AcpiNsAttachObject ((ACPI_NAMESPACE_NODE *)Node->Object, ObjDesc, ObjDesc->Common.Type);
             return_ACPI_STATUS (Status);
         }