diff --git a/src/backend/access/common/reloptions_gp.c b/src/backend/access/common/reloptions_gp.c
index 146962d4f62..b6022e1ccc4 100644
--- a/src/backend/access/common/reloptions_gp.c
+++ b/src/backend/access/common/reloptions_gp.c
@@ -727,7 +727,9 @@ reloption_is_default(const char *optstr, int optlen)
 	else
 		res = false;
 
-	pfree(defaultopt);
+	if (defaultopt)
+		pfree(defaultopt);
+
 	return res;
 }
 
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index bd74faf4bbe..e314238d644 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -16176,7 +16176,7 @@ ATExecSetRelOptions(Relation rel, List *defList, AlterTableType operation,
 			if ((RelationIsAppendOptimized(rel) && !am_change_heap_ao) || 
 					(!RelationIsAppendOptimized(rel) && am_change_heap_ao))
 			{
-				StdRdOptions *stdRdOptions = (StdRdOptions *) table_reloptions(rel->rd_tableam->amoptions, newOptions, rel->rd_rel->relkind, true);
+				StdRdOptions *stdRdOptions = (StdRdOptions *) default_reloptions(newOptions, true, RELOPT_KIND_APPENDOPTIMIZED);
 				validateAppendOnlyRelOptions(stdRdOptions->blocksize,
 											 gp_safefswritesize,
 											 stdRdOptions->compresslevel,
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index fad11f96337..43d723aed5f 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -1712,7 +1712,7 @@ EnableDisableTriggerNew(Relation rel, const char *tgname,
 			rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE &&
 			(TRIGGER_FOR_ROW(oldtrig->tgtype)))
 		{
-			PartitionDesc partdesc = RelationGetPartitionDesc(rel);
+			PartitionDesc partdesc = RelationGetPartitionDesc(rel, false);
 			int			i;
 
 			for (i = 0; i < partdesc->nparts; i++)
diff --git a/src/include/commands/tablecmds.h b/src/include/commands/tablecmds.h
index 9ebe2b810dc..6cc179e96e4 100644
--- a/src/include/commands/tablecmds.h
+++ b/src/include/commands/tablecmds.h
@@ -32,10 +32,6 @@
 
 struct AlterTableUtilityContext;	/* avoid including tcop/utility.h here */
 
-/* Convenient macro for checking AO AMs */
-#define IsAccessMethodAO(am_oid) \
-	(am_oid == AO_ROW_TABLE_AM_OID || am_oid == AO_COLUMN_TABLE_AM_OID)
-
 extern const char *synthetic_sql;
 
 extern void	DefineExternalRelation(CreateExternalStmt *stmt);