diff --git a/cf-agent/cf_sql.c b/cf-agent/cf_sql.c
index aaf936ec71..23684e12cc 100644
--- a/cf-agent/cf_sql.c
+++ b/cf-agent/cf_sql.c
@@ -384,7 +384,7 @@ void CfCloseDB(CfdbConn *cfdb)
 
 /*****************************************************************************/
 
-void CfVoidQueryDB(CfdbConn *cfdb, char *query)
+void CfVoidQueryDB(CfdbConn *cfdb, const char *query)
 {
     if (!cfdb->connected)
     {
@@ -398,7 +398,7 @@ void CfVoidQueryDB(CfdbConn *cfdb, char *query)
 
 /*****************************************************************************/
 
-void CfNewQueryDB(CfdbConn *cfdb, char *query)
+void CfNewQueryDB(CfdbConn *cfdb, const char *query)
 {
     cfdb->result = false;
     cfdb->row = 0;
diff --git a/cf-agent/cf_sql.h b/cf-agent/cf_sql.h
index fb55cd3432..fb11a4131e 100644
--- a/cf-agent/cf_sql.h
+++ b/cf-agent/cf_sql.h
@@ -42,8 +42,8 @@ typedef struct
 
 void CfConnectDB(CfdbConn *cfdb, DatabaseType dbtype, char *remotehost, char *dbuser, char *passwd, char *db);
 void CfCloseDB(CfdbConn *cfdb);
-void CfVoidQueryDB(CfdbConn *cfdb, char *query);
-void CfNewQueryDB(CfdbConn *cfdb, char *query);
+void CfVoidQueryDB(CfdbConn *cfdb, const char *query);
+void CfNewQueryDB(CfdbConn *cfdb, const char *query);
 char **CfFetchRow(CfdbConn *cfdb);
 char *CfFetchColumn(CfdbConn *cfdb, int col);
 void CfDeleteQuery(CfdbConn *cfdb);
diff --git a/cf-agent/verify_databases.c b/cf-agent/verify_databases.c
index 1b99e1ad20..5c93e15919 100644
--- a/cf-agent/verify_databases.c
+++ b/cf-agent/verify_databases.c
@@ -743,48 +743,50 @@ static int TableExists(CfdbConn *cfdb, char *name)
 
 static bool CreateTableColumns(CfdbConn *cfdb, char *table, Rlist *columns)
 {
-    char entry[CF_MAXVARSIZE], query[CF_BUFSIZE];
     int i, *size_table, *done;
     char **name_table, **type_table;
     int no_of_cols = RlistLen(columns);
 
-    Log(LOG_LEVEL_ERR, "Trying to create table '%s'", table);
+    Log(LOG_LEVEL_VERBOSE, "Trying to create table '%s'", table);
 
     if (!NewSQLColumns(table, columns, &name_table, &type_table, &size_table, &done))
     {
         return false;
     }
 
-    if (no_of_cols > 0)
+    if (no_of_cols <= 0)
     {
-        snprintf(query, CF_BUFSIZE - 1, "create table %s(", table);
-
-        for (i = 0; i < no_of_cols; i++)
-        {
-            Log(LOG_LEVEL_VERBOSE, "Forming column template %s %s %d", name_table[i], type_table[i],
-                  size_table[i]);;
+        Log(LOG_LEVEL_ERR, "Attempted to create table '%s' without any columns", table);
+        return false;
+    }
 
-            if (size_table[i] > 0)
-            {
-                snprintf(entry, CF_MAXVARSIZE - 1, "%s %s(%d)", name_table[i], type_table[i], size_table[i]);
-            }
-            else
-            {
-                snprintf(entry, CF_MAXVARSIZE - 1, "%s %s", name_table[i], type_table[i]);
-            }
+    Buffer *query = BufferNew();
+    BufferPrintf(query, "create table %s(", table);
 
-            strcat(query, entry);
+    for (i = 0; i < no_of_cols; i++)
+    {
+        Log(LOG_LEVEL_VERBOSE, "Forming column template %s %s %d", name_table[i], type_table[i],
+              size_table[i]);;
 
-            if (i < no_of_cols - 1)
-            {
-                strcat(query, ",");
-            }
+        if (size_table[i] > 0)
+        {
+            BufferAppendF(query, "%s %s(%d)", name_table[i], type_table[i], size_table[i]);
+        }
+        else
+        {
+            BufferAppendF(query, "%s %s", name_table[i], type_table[i]);
         }
 
-        strcat(query, ")");
+        if (i < no_of_cols - 1)
+        {
+            BufferAppendChar(query, ',');
+        }
     }
 
-    CfVoidQueryDB(cfdb, query);
+    BufferAppendChar(query, ')');
+
+    CfVoidQueryDB(cfdb, BufferData(query));
+    BufferDestroy(query);
     DeleteSQLColumns(name_table, type_table, size_table, done, no_of_cols);
     return true;
 }