diff --git a/mesosphere/kernel/kernel.ld b/mesosphere/kernel/kernel.ld
index 1a49877b5..765c33ef4 100644
--- a/mesosphere/kernel/kernel.ld
+++ b/mesosphere/kernel/kernel.ld
@@ -157,10 +157,11 @@ SECTIONS
 		*(COMMON)
 		. = ALIGN(8);
 	} : data
-	__bss_end__ = .;
 
 	. = ALIGN(0x1000);
 
+	__bss_end__ = .;
+
 	__end__ = ABSOLUTE(.);
 
 	/* ==================
diff --git a/mesosphere/kernel/source/arch/arm64/start.s b/mesosphere/kernel/source/arch/arm64/start.s
index 71118be28..dcac66891 100644
--- a/mesosphere/kernel/source/arch/arm64/start.s
+++ b/mesosphere/kernel/source/arch/arm64/start.s
@@ -220,7 +220,7 @@ begin_flush_cache_local_loop:
     cmn w9, #1
     b.eq done_flush_cache_local_loop
 
-    /* FlushEntireDataCacheImplWithoutStack(level); */
+    /*     FlushEntireDataCacheImplWithoutStack(level); */
     mov w0, w9
     bl _ZN3ams4kern5arm643cpu36FlushEntireDataCacheImplWithoutStackEv
 
@@ -256,7 +256,7 @@ begin_flush_cache_shared_loop:
     cmp w10, w9
     b.gt done_flush_cache_shared_loop
 
-    /* FlushEntireDataCacheImplWithoutStack(level); */
+    /*     FlushEntireDataCacheImplWithoutStack(level); */
     mov w0, w9
     bl _ZN3ams4kern5arm643cpu36FlushEntireDataCacheImplWithoutStackEv