diff --git a/runtime/include/arch/aarch64/context.h b/runtime/include/arch/aarch64/context.h
index f58e22c..88950c8 100644
--- a/runtime/include/arch/aarch64/context.h
+++ b/runtime/include/arch/aarch64/context.h
@@ -100,8 +100,8 @@ arch_context_switch(struct arch_context *a, struct arch_context *b)
 	                 ".align 8\n\t"
 	                 "exit%=:\n\t"
 	                 :
-	                 : [a] "r"(a_registers), [b] "r"(b_registers), [av] "r"(&a->variant), [bv] "r"(&b->variant),
-	                   [slowpath] "r"(&arch_context_restore_preempted)
+	                 : [ a ] "r"(a_registers), [ b ] "r"(b_registers), [ av ] "r"(&a->variant),
+	                   [ bv ] "r"(&b->variant), [ slowpath ] "r"(&arch_context_restore_preempted)
 	                 : "memory", "cc", "x0", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11",
 	                   "x12", "x13", "x14", "x15", "x16", "x17", "x18", "x19", "x20", "x21", "x22", "x23", "x24",
 	                   "d8", "d9", "d10", "d11", "d12", "d13", "d14", "d15");
diff --git a/runtime/include/sandbox_perf_log.h b/runtime/include/sandbox_perf_log.h
index 11b729c..aa9f640 100644
--- a/runtime/include/sandbox_perf_log.h
+++ b/runtime/include/sandbox_perf_log.h
@@ -13,9 +13,9 @@ static inline void
 sandbox_perf_log_print_header()
 {
 	if (sandbox_perf_log == NULL) { perror("sandbox perf log"); }
-	fprintf(sandbox_perf_log,
-	        "id,module,port,state,deadline,actual,queued,uninitialized,allocated,initialized,runnable,interrupted,preempted,"
-	        "running_sys,running_user,asleep,returned,complete,error,proc_MHz,memory\n");
+	fprintf(sandbox_perf_log, "id,module,port,state,deadline,actual,queued,uninitialized,allocated,initialized,"
+	                          "runnable,interrupted,preempted,"
+	                          "running_sys,running_user,asleep,returned,complete,error,proc_MHz,memory\n");
 }
 
 /**