diff --git a/src/backend/distributed/commands/database.c b/src/backend/distributed/commands/database.c
index ba58a6d6a..3388b5618 100644
--- a/src/backend/distributed/commands/database.c
+++ b/src/backend/distributed/commands/database.c
@@ -225,7 +225,7 @@ PreprocessAlterDatabaseStmt(Node *node, const char *queryString,
 		 * the transaction block.
 		 */
 
-		return NontransactionalNodeDDLTask(NON_COORDINATOR_NODES, commands);
+		return NontransactionalNodeDDLTaskList(NON_COORDINATOR_NODES, commands);
 	}
 	else
 	{
diff --git a/src/backend/distributed/deparser/deparse_database_stmts.c b/src/backend/distributed/deparser/deparse_database_stmts.c
index bd617f9aa..02640ed21 100644
--- a/src/backend/distributed/deparser/deparse_database_stmts.c
+++ b/src/backend/distributed/deparser/deparse_database_stmts.c
@@ -148,7 +148,7 @@ AppendBasicAlterDatabaseOptions(StringInfo buf, DefElem *def, bool
 		appendStringInfo(buf, "ALTER DATABASE %s WITH", quote_identifier(dbname));
 		prefix_appended_for_basic_options = true;
 	}
-	optionToStatement(buf, def, alter_database_option_formats, lengthof(
+	DefElemOptionToStatement(buf, def, alter_database_option_formats, lengthof(
 						  alter_database_option_formats));
 	return prefix_appended_for_basic_options;
 }