Index: /trunk/src/VBox/ValidationKit/bootsectors/bootsector2-common-init-code.mac
===================================================================
--- /trunk/src/VBox/ValidationKit/bootsectors/bootsector2-common-init-code.mac	(revision 58542)
+++ /trunk/src/VBox/ValidationKit/bootsectors/bootsector2-common-init-code.mac	(revision 58543)
@@ -1694,4 +1694,6 @@
 %elifdef BS2_INC_CMN_LM
  %define BS2_INC_BS2EXITMODE_P16
+%elifdef BS2_INC_CMN_P32
+ %define BS2_INC_BS2EXITMODE_P16
 %endif
 
Index: /trunk/src/VBox/ValidationKit/bootsectors/bootsector2-common-init-traps.mac
===================================================================
--- /trunk/src/VBox/ValidationKit/bootsectors/bootsector2-common-init-traps.mac	(revision 58542)
+++ /trunk/src/VBox/ValidationKit/bootsectors/bootsector2-common-init-traps.mac	(revision 58543)
@@ -534,4 +534,8 @@
         mov     eax, ss                 ; load flat DS. Using SS here because of conforming IDTE.CS tests.
         mov     ds, ax
+
+        pushfd                          ; Clear the AC flag.
+        and     dword [esp], ~X86_EFL_AC
+        popfd
 
         ;