diff --git a/so3/avz/include/avz/domain.h b/so3/avz/include/avz/domain.h
index 4ec7e705c..27e1ebd9e 100644
--- a/so3/avz/include/avz/domain.h
+++ b/so3/avz/include/avz/domain.h
@@ -34,16 +34,18 @@
 
 #ifdef __ASSEMBLY__
 
-.macro curdom rd,
-	tmp
-
-		// Compute the address of the stack bottom where cpu_info is located.
-		ldr	\rd,
-	= (~(DOMAIN_STACK_SIZE - 1)) mov	\tmp, sp and	\rd, \tmp, \rd
-
-						       // Get the address of the domain descriptor
-						       ldr	\rd,
-	[\rd].endm
+/* clang-format off */
+.macro curdom rd, tmp
+
+	// Compute the address of the stack bottom where cpu_info is located.
+	ldr	\rd, = (~(DOMAIN_STACK_SIZE - 1)) 
+	mov	\tmp, sp 
+	and	\rd, \tmp, \rd
+
+	// Get the address of the domain descriptor
+	ldr	\rd, [\rd]
+.endm
+/* clang-format on */
 
 #else /* __ASSEMBLY__ */
 
diff --git a/target/virt64_capsule.its b/target/virt64_capsule.its
index 30a0ff85d..68340a8b7 100644
--- a/target/virt64_capsule.its
+++ b/target/virt64_capsule.its
@@ -36,7 +36,7 @@
  
         fdt {
 			description = "Flattened Device Tree blob";
-			data = /incbin/("../so3/dts/virt64_guest.dtb");
+			data = /incbin/("../so3/dts/virt64_capsule.dtb");
 			type = "flat_dt";
 			arch = "arm64";
 			compression = "none";