diff --git a/platform/msm_shared/scm.c b/platform/msm_shared/scm.c
index e2a493b..f9a7377 100644
--- a/platform/msm_shared/scm.c
+++ b/platform/msm_shared/scm.c
@@ -61,11 +61,13 @@
 
 bool is_scm_armv8_support()
 {
+#if !NO_SCM_V8_SUPPORT
 	if (!scm_initialized)
 	{
 		scm_init();
 		scm_initialized = true;
 	}
+#endif
 
 	return scm_arm_support;
 }
diff --git a/project/fsm9010.mk b/project/fsm9010.mk
index 7759f73..d3d0262 100644
--- a/project/fsm9010.mk
+++ b/project/fsm9010.mk
@@ -23,6 +23,7 @@
 #DEFINES += MMC_BOOT_BAM=1
 DEFINES += CRYPTO_BAM=1
 DEFINES += CRYPTO_REG_ACCESS=1
+DEFINES += NO_SCM_V8_SUPPORT=1
 
 #Disable thumb mode
 ENABLE_THUMB := false
diff --git a/target/mdmfermium/init.c b/target/mdmfermium/init.c
index 5a91d7f..383cbdd 100644
--- a/target/mdmfermium/init.c
+++ b/target/mdmfermium/init.c
@@ -224,7 +224,7 @@
 {
 	uint32_t serialno;
 	serialno = board_chip_serial();
-	snprintf((char *)buf, sizeof(uint32_t)+1, "%x", serialno);
+	snprintf((char *)buf, 13, "%x", serialno);
 }
 
 unsigned check_reboot_mode(void)