diff --git a/ef_jira.tf b/ef_jira.tf
index fa12836..41f583a 100644
--- a/ef_jira.tf
+++ b/ef_jira.tf
@@ -9,22 +9,22 @@ resource "snowflake_external_function" "snowalert_jira_api" {
   # Function arguments
   arg {
     name = "METHOD"
-    type = "STRING"
+    type = "VARCHAR"
   }
 
   arg {
     name = "PATH"
-    type = "STRING"
+    type = "VARCHAR"
   }
 
   arg {
     name = "BODY"
-    type = "STRING"
+    type = "VARCHAR"
   }
 
   arg {
     name = "QUERYSTRING"
-    type = "STRING"
+    type = "VARCHAR"
   }
 
   # Function headers
diff --git a/functions.tf b/functions.tf
index a7e75db..75910ce 100644
--- a/functions.tf
+++ b/functions.tf
@@ -159,7 +159,7 @@ resource "snowflake_function" "time_slices_before_t_without_time" {
     type = "NUMBER"
   }
 
-  return_type = "TABLE ( slice_start TIMESTAMP, slice_end TIMESTAMP )"
+  return_type = "TABLE (slice_start TIMESTAMP_NTZ, slice_end TIMESTAMP_NTZ)"
   statement = templatefile(
     "${path.module}/functions_sql/time_slices_before_t_without_time.sql", {
       data_time_slices_without_tz_function = local.data_time_slices_without_tz_function
@@ -275,15 +275,15 @@ resource "snowflake_function" "json_beautify_with_indent" {
 
   arguments {
     name = "STR"
-    type = "STRING"
+    type = "VARCHAR"
   }
 
   arguments {
     name = "INDENT"
-    type = "DOUBLE"
+    type = "FLOAT"
   }
 
-  return_type = "STRING"
+  return_type = "VARCHAR"
   language    = "javascript"
   statement   = <<javascript
 try {
@@ -307,10 +307,10 @@ resource "snowflake_function" "json_beautify_without_indent" {
 
   arguments {
     name = "STR"
-    type = "STRING"
+    type = "VARCHAR"
   }
 
-  return_type = "STRING"
+  return_type = "VARCHAR"
   language    = "javascript"
   statement = <<javascript
 ${join(".", [
diff --git a/tables.tf b/tables.tf
index 7863449..44ecdae 100644
--- a/tables.tf
+++ b/tables.tf
@@ -166,6 +166,11 @@ resource "snowflake_table" "violations" {
     type = "VARIANT"
   }
 
+  column {
+    name = "ID"
+    type = "VARCHAR(16777216)"
+  }
+
   column {
     name = "ALERT_TIME"
     type = "TIMESTAMP_LTZ(9)"
@@ -186,11 +191,6 @@ resource "snowflake_table" "violations" {
     type = "VARCHAR(16777216)"
   }
 
-  column {
-    name = "ID"
-    type = "VARCHAR(16777216)"
-  }
-
   depends_on = [
     module.snowalert_grants
   ]