diff --git a/clouds/bigquery/common/.sqlfluff b/clouds/bigquery/common/.sqlfluff
index 98e04a27e..a51412b7d 100755
--- a/clouds/bigquery/common/.sqlfluff
+++ b/clouds/bigquery/common/.sqlfluff
@@ -11,7 +11,7 @@ templater = jinja
 # Comma separated list of rules to check, default to all
 rules = all
 # Comma separated list of rules to exclude, or None
-exclude_rules = L016,L025,L031,L032,L029,L022,L036,L003,L064,L061,L027,L017,L049
+exclude_rules = L016,L025,L031,L032,L029,L022,L036,L003,L064,L061,L027,L017,L049,L044
 # The depth to recursively parse to (0 for unlimited)
 recurse = 0
 # Below controls SQLFluff output, see max_line_length for SQL output
diff --git a/clouds/bigquery/common/build_modules.js b/clouds/bigquery/common/build_modules.js
index c173721a7..ae2620d18 100755
--- a/clouds/bigquery/common/build_modules.js
+++ b/clouds/bigquery/common/build_modules.js
@@ -99,7 +99,7 @@ functionsFilter.forEach(f => {
 if (!nodeps) {
     functions.forEach(mainFunction => {
         functions.forEach(depFunction => {
-            if (mainFunction.name != depFunction.name) {
+            if (mainFunction.name != depFunction.name && depFunction.name !== 'SETUP') {
                 const depFunctionMatches = [];
                 depFunctionMatches.push(...depFunction.content.replace(/(\r\n|\n|\r)/gm,' ').matchAll(new RegExp('(?<=(?<!TEMP )FUNCTION)(.*?)(?=AS |RETURNS)','g')));
                 depFunctionMatches.push(...depFunction.content.replace(/(\r\n|\n|\r)/gm,' ').matchAll(new RegExp('(?<=PROCEDURE)(.*?)(?=BEGIN)','g')));
diff --git a/clouds/bigquery/modules/Makefile b/clouds/bigquery/modules/Makefile
index 5e7d737e9..46031c30d 100644
--- a/clouds/bigquery/modules/Makefile
+++ b/clouds/bigquery/modules/Makefile
@@ -70,6 +70,9 @@ endif
 ifdef BQ_PERMISSIONS_GROUP
 	BQ_PERMISSIONS_TARGET_DATASET=$(BQ_DEPLOY_DATASET) $(COMMON_DIR)/set_module_permissions_group.sh
 endif
+	$(MAKE) extra-deploy
+
+extra-deploy::
 
 dataset-create:
 	$(BQ) show $(BQ_DEPLOY_DATASET) 2>/dev/null 1>/dev/null || \
diff --git a/clouds/databricks/modules/Makefile b/clouds/databricks/modules/Makefile
index f5a8cb17a..6c21640f9 100644
--- a/clouds/databricks/modules/Makefile
+++ b/clouds/databricks/modules/Makefile
@@ -37,6 +37,9 @@ deploy: check build
 	$(VENV3_BIN)/python $(COMMON_DIR)/python_utils/run_query.py "CREATE SCHEMA IF NOT EXISTS $(DB_SCHEMA);"
 	$(MAKE) upload-sql
 	$(MAKE) create-udfs
+	$(MAKE) extra-deploy
+
+extra-deploy::
 
 upload-sql:
 	echo "- Installing create functions"
diff --git a/clouds/postgres/modules/Makefile b/clouds/postgres/modules/Makefile
index dcbfec5f7..44f26d760 100644
--- a/clouds/postgres/modules/Makefile
+++ b/clouds/postgres/modules/Makefile
@@ -49,6 +49,9 @@ deploy: check venv3 build
 	echo "Deploying modules..."
 	$(VENV3_BIN)/python $(COMMON_DIR)/run_query.py "CREATE SCHEMA IF NOT EXISTS $(PG_SCHEMA);"
 	$(VENV3_BIN)/python $(COMMON_DIR)/run_script.py $(BUILD_DIR)/modules.sql
+	$(MAKE) extra-deploy
+
+extra-deploy::
 
 test: check venv3 $(NODE_MODULES_DEV)
 	echo "Testing modules..."
diff --git a/clouds/redshift/modules/Makefile b/clouds/redshift/modules/Makefile
index d5c8b1778..bc16e6576 100644
--- a/clouds/redshift/modules/Makefile
+++ b/clouds/redshift/modules/Makefile
@@ -49,6 +49,9 @@ deploy: check venv3 build
 	echo "Deploying modules..."
 	$(VENV3_BIN)/python $(COMMON_DIR)/run_query.py "CREATE SCHEMA IF NOT EXISTS $(RS_SCHEMA);"
 	$(VENV3_BIN)/python $(COMMON_DIR)/run_script.py $(BUILD_DIR)/modules.sql
+	$(MAKE) extra-deploy
+
+extra-deploy::
 
 test: check venv3 $(NODE_MODULES_DEV)
 	echo "Testing modules..."
diff --git a/clouds/snowflake/modules/Makefile b/clouds/snowflake/modules/Makefile
index 1fc16b935..02f2be59f 100644
--- a/clouds/snowflake/modules/Makefile
+++ b/clouds/snowflake/modules/Makefile
@@ -72,6 +72,9 @@ deploy: check build
 	echo "Deploying modules..."
 	$(COMMON_DIR)/run-query.js "CREATE SCHEMA IF NOT EXISTS $(SF_SCHEMA);"
 	$(COMMON_DIR)/run-script.js $(BUILD_DIR)/modules.sql
+	$(MAKE) extra-deploy
+
+extra-deploy::
 
 deploy-share: check build-share
 	echo "Deploying share..."