diff --git a/packages/api/src/shell/sqlTextReplacementTransform.js b/packages/api/src/shell/sqlTextReplacementTransform.js
index ed701d606..3e4270869 100644
--- a/packages/api/src/shell/sqlTextReplacementTransform.js
+++ b/packages/api/src/shell/sqlTextReplacementTransform.js
@@ -7,6 +7,7 @@ function replaceInText(text, replacements) {
 }
 
 function replaceInCollection(collection, replacements) {
+  if (!collection) return collection;
   return collection.map(item => {
     if (item.createSql) {
       return {
@@ -22,6 +23,9 @@ const sqlTextReplacementTransform = replacements => database => {
   return {
     ...database,
     views: replaceInCollection(database.views, replacements),
+    matviews: replaceInCollection(database.matviews, replacements),
+    procedures: replaceInCollection(database.procedures, replacements),
+    functions: replaceInCollection(database.functions, replacements),
   };
 };
 
diff --git a/packages/tools/src/diffTools.ts b/packages/tools/src/diffTools.ts
index abf2de20e..404104207 100644
--- a/packages/tools/src/diffTools.ts
+++ b/packages/tools/src/diffTools.ts
@@ -556,7 +556,7 @@ export function testEqualTables(
 }
 
 export function testEqualSqlObjects(a: SqlObjectInfo, b: SqlObjectInfo, opts: DbDiffOptions) {
-  return a.createSql == b.createSql;
+  return a.createSql?.trim() == b.createSql?.trim();
 }
 
 export function createAlterTablePlan(