diff --git a/platform/msm_shared/dev_tree.c b/platform/msm_shared/dev_tree.c
index 2df16f0..5ad8faf 100644
--- a/platform/msm_shared/dev_tree.c
+++ b/platform/msm_shared/dev_tree.c
@@ -2003,7 +2003,7 @@
 	int ret = 0;
 	uint32_t offset;
 #if ENABLE_KASLRSEED_SUPPORT
-	uintptr_t kaslrseed;
+	uint64_t kaslrseed;
 #endif
 	uint32_t cmdline_len = 0;
 
@@ -2070,7 +2070,7 @@
 	}
 
 #if ENABLE_KASLRSEED_SUPPORT
-	if (!scm_random(&kaslrseed, sizeof(kaslrseed))) {
+	if (!scm_random((uintptr_t *)&kaslrseed, sizeof(kaslrseed))) {
 		/* Adding Kaslr Seed to the chosen node */
 		ret = fdt_appendprop_u64 (fdt, offset, (const char *)"kaslr-seed", (uint64_t)kaslrseed);
 		if (ret)
diff --git a/platform/msm_shared/rpmb/rpmb_listener.c b/platform/msm_shared/rpmb/rpmb_listener.c
index 07b71b8..61ad8f1 100644
--- a/platform/msm_shared/rpmb/rpmb_listener.c
+++ b/platform/msm_shared/rpmb/rpmb_listener.c
@@ -108,7 +108,7 @@
 	struct tz_rpmb_rw_req *req_p = (struct tz_rpmb_rw_req *)buf;
 	struct tz_rpmb_rw_resp *resp_p = NULL;
 	uint32_t *req_buf = buf + req_p->req_buff_offset;
-	uint32_t *resp_buf = buf + ROUNDUP(sizeof(struct tz_rpmb_rw_resp), CACHE_LINE);
+	uint32_t *resp_buf = buf + sizeof(struct tz_rpmb_rw_resp);
 
 	resp_p = (struct tz_rpmb_rw_resp *) buf;
 
@@ -133,7 +133,7 @@
 			ASSERT(0);
 	};
 
-	resp_p->res_buff_offset = ROUNDUP(sizeof(struct tz_rpmb_rw_resp), CACHE_LINE);
+	resp_p->res_buff_offset = sizeof(struct tz_rpmb_rw_resp);
 	resp_p->cmd_id = req_p->cmd_id;
 }
 
diff --git a/target/msm8952/init.c b/target/msm8952/init.c
index 648af17..7c94d06 100644
--- a/target/msm8952/init.c
+++ b/target/msm8952/init.c
@@ -724,14 +724,19 @@
 
 uint32_t target_get_pmic()
 {
+	uint32_t pmi_type = 0;
+
 	if (target_is_pmi_enabled()) {
-		uint32_t pmi_type = board_pmic_target(1) & PMIC_TYPE_MASK;
+		pmi_type = board_pmic_target(1) & PMIC_TYPE_MASK;
 		if (pmi_type == PMIC_IS_PMI632)
 			return PMIC_IS_PMI632;
 		else
 			return PMIC_IS_PMI8950;
-	}
-	else {
+	} else {
+		if (platform_is_qm215()) {
+			pmi_type = board_pmic_target(0) & PMIC_TYPE_MASK;
+			return pmi_type;
+		}
 		return PMIC_IS_UNKNOWN;
 	}
 }