--- a/ocaml/xapi/xapi_pool.ml
+++ b/ocaml/xapi/xapi_pool.ml
@@ -827,8 +827,8 @@
 
 		debug "Pool.eject: resetting CPU features";
 		(* Clear the CPU feature masks from the Xen command line *)
-		ignore (Xen_cmdline.delete_cpuid_masks
-			["cpuid_mask_ecx"; "cpuid_mask_edx"; "cpuid_mask_ext_ecx"; "cpuid_mask_ext_edx"]);
+		(* ignore (Xen_cmdline.delete_cpuid_masks *)
+		(* 	["cpuid_mask_ecx"; "cpuid_mask_edx"; "cpuid_mask_ext_ecx"; "cpuid_mask_ext_edx"]); *)
 
 		(* and destroy my control domain, since you can't do this from the API [operation not allowed] *)
 		begin try
--- a/ocaml/xapi/xapi_globs.ml
+++ b/ocaml/xapi/xapi_globs.ml
@@ -590,7 +590,7 @@
 (** Path to trigger file for Network Reset. *)
 let network_reset_trigger = "/tmp/network-reset"
 
-let first_boot_dir = "/etc/firstboot.d/"
+let first_boot_dir = "/var/lib/xcp/firstboot.d/"
 
 
 (** Dynamic configurations to be read whenever xapi (re)start *)
