diff --git a/platform/msm_shared/include/partition_parser.h b/platform/msm_shared/include/partition_parser.h
index 25a73ca..bbd8422 100644
--- a/platform/msm_shared/include/partition_parser.h
+++ b/platform/msm_shared/include/partition_parser.h
@@ -72,7 +72,7 @@
 #define MAX_GPT_NAME_SIZE          72
 #define PARTITION_TYPE_GUID_SIZE   16
 #define UNIQUE_PARTITION_GUID_SIZE 16
-#define NUM_PARTITIONS             32
+#define NUM_PARTITIONS             128
 
 /* Some useful define used to access the MBR/EBR table */
 #define BLOCK_SIZE                0x200
diff --git a/platform/msm_shared/partition_parser.c b/platform/msm_shared/partition_parser.c
index e2d548e..6facb93 100644
--- a/platform/msm_shared/partition_parser.c
+++ b/platform/msm_shared/partition_parser.c
@@ -58,7 +58,7 @@
 unsigned int ext3_count = 0;
 unsigned int vfat_count = 0;
 
-struct partition_entry partition_entries[NUM_PARTITIONS];
+struct partition_entry *partition_entries;
 static unsigned gpt_partitions_exist = 0;
 unsigned partition_count = 0;
 
@@ -69,6 +69,10 @@
 
 	block_size = mmc_get_device_blocksize();
 
+	/* Allocate partition entries array */
+	partition_entries = (struct partition_entry *) calloc(NUM_PARTITIONS, sizeof(struct partition_entry));
+	ASSERT(partition_entries);
+
 	/* Read MBR of the card */
 	ret = mmc_boot_read_mbr(block_size);
 	if (ret) {
diff --git a/target/msm8226/oem_panel.c b/target/msm8226/oem_panel.c
index e32499a..9f3127b 100755
--- a/target/msm8226/oem_panel.c
+++ b/target/msm8226/oem_panel.c
@@ -349,14 +349,10 @@
 		break;
 	case HW_PLATFORM_MTP:
 	case HW_PLATFORM_SURF:
-		if (hw_subtype == HW_PLATFORM_SUBTYPE_720P) {
-			panel_id = nt35590_panel_id;
-		} else if (hw_subtype == HW_PLATFORM_SUBTYPE_1080P) {
+		if (hw_subtype == HW_PLATFORM_SUBTYPE_1080P) {
 			panel_id = JDI_1080P_VIDEO_PANEL;
 		} else {
-			dprintf(CRITICAL, "Unsupported target_id=%d hw_subtype=%d\n"
-				, target_id, hw_subtype);
-			return false;
+			panel_id = nt35590_panel_id;
 		}
 		break;
 	default: