diff --git a/patch/fault_inject/induce_bl31_main_panic.patch b/patch/fault_inject/induce_bl31_main_panic.patch
index 80f093a..1e0988c 100644
--- a/patch/fault_inject/induce_bl31_main_panic.patch
+++ b/patch/fault_inject/induce_bl31_main_panic.patch
@@ -1,11 +1,11 @@
 diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c
-index cae55f314..2a0951d49 100644
+index 8c5ba6f2e..b1ef0b005 100644
 --- a/bl31/bl31_main.c
 +++ b/bl31/bl31_main.c
-@@ -216,6 +216,8 @@ void bl31_main(void)
- 	PMF_CAPTURE_TIMESTAMP(bl_svc, BL31_EXIT, PMF_CACHE_MAINT);
+@@ -224,6 +224,8 @@ void bl31_main(void)
+ 
  	console_flush();
- #endif
+ 	console_switch_state(CONSOLE_FLAG_RUNTIME);
 +
 +	panic();
  }
diff --git a/patch/readonly_xlat_tables/arm_bl31_setup_write_after_readonly.patch b/patch/readonly_xlat_tables/arm_bl31_setup_write_after_readonly.patch
index b6869d6..5c8ca0a 100644
--- a/patch/readonly_xlat_tables/arm_bl31_setup_write_after_readonly.patch
+++ b/patch/readonly_xlat_tables/arm_bl31_setup_write_after_readonly.patch
@@ -1,10 +1,12 @@
+diff --git a/plat/arm/common/arm_bl31_setup.c b/plat/arm/common/arm_bl31_setup.c
+index 58809b52e..e01e37bb3 100644
 --- a/plat/arm/common/arm_bl31_setup.c
 +++ b/plat/arm/common/arm_bl31_setup.c
-@@ -256,6 +256,7 @@ void arm_bl31_plat_runtime_setup(void)
-
+@@ -337,6 +337,7 @@ void arm_bl31_plat_runtime_setup(void)
+ 
  #if PLAT_RO_XLAT_TABLES
  	arm_xlat_make_tables_readonly();
 +	arm_free_init_memory();
  #endif
  }
-
+ 
diff --git a/patch/ubsan/ubsan_test.patch b/patch/ubsan/ubsan_test.patch
index 619f817..c452e6b 100644
--- a/patch/ubsan/ubsan_test.patch
+++ b/patch/ubsan/ubsan_test.patch
@@ -1,5 +1,5 @@
 diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c
-index c8cc2c7199..18ae4bdfa0 100644
+index 8c5ba6f2e..21ed3b686 100644
 --- a/bl31/bl31_main.c
 +++ b/bl31/bl31_main.c
 @@ -112,6 +112,19 @@ void bl31_setup(u_register_t arg0, u_register_t arg1, u_register_t arg2,
@@ -22,10 +22,10 @@
  /*******************************************************************************
   * BL31 is responsible for setting up the runtime services for the primary cpu
   * before passing control to the bootloader or an Operating System. This
-@@ -223,6 +236,10 @@ void bl31_main(void)
- 	PMF_CAPTURE_TIMESTAMP(bl_svc, BL31_EXIT, PMF_CACHE_MAINT);
+@@ -224,6 +237,10 @@ void bl31_main(void)
+ 
  	console_flush();
- #endif
+ 	console_switch_state(CONSOLE_FLAG_RUNTIME);
 +
 +	/* Run UBSAN Test */
 +	INFO("BL31: Running UBSAN test\n");