diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs
index e5e4524a..4832dc4f 100644
--- a/server/AyaNova/util/AySchema.cs
+++ b/server/AyaNova/util/AySchema.cs
@@ -24,10 +24,10 @@ namespace AyaNova.Util
 
         internal const long EXPECTED_COLUMN_COUNT = 710;
         internal const long EXPECTED_INDEX_COUNT = 124;
-        internal const long EXPECTED_CHECK_CONSTRAINTS=1;
-        internal const long EXPECTED_FOREIGN_KEY_CONSTRAINTS=1;
-        internal const long EXPECTED_VIEWS=1;
-        internal const long EXPECTED_ROUTINES=1;
+        internal const long EXPECTED_CHECK_CONSTRAINTS = 318;
+        internal const long EXPECTED_FOREIGN_KEY_CONSTRAINTS = 61;
+        internal const long EXPECTED_VIEWS = 1;
+        internal const long EXPECTED_ROUTINES = 2;
 
         //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!!
 
diff --git a/server/AyaNova/util/DbUtil.cs b/server/AyaNova/util/DbUtil.cs
index 0923fed3..34a53a51 100644
--- a/server/AyaNova/util/DbUtil.cs
+++ b/server/AyaNova/util/DbUtil.cs
@@ -565,8 +565,7 @@ namespace AyaNova.Util
                         }
                     }
                 }
-                await conn.CloseAsync();
-
+              
                 //CHECK CONSTRAINTS
                 using (var command = conn.CreateCommand())
                 {
@@ -589,9 +588,7 @@ namespace AyaNova.Util
                         }
                     }
                 }
-                await conn.CloseAsync();
-
-
+               
                 //FOREIGN KEY CONSTRAINTS
                 using (var command = conn.CreateCommand())
                 {
@@ -614,10 +611,7 @@ namespace AyaNova.Util
                         }
                     }
                 }
-                await conn.CloseAsync();
-
-
-
+               
                 //VIEWS
                 using (var command = conn.CreateCommand())
                 {
@@ -640,10 +634,7 @@ namespace AyaNova.Util
                         }
                     }
                 }
-                await conn.CloseAsync();
-
-
-
+               
                 //ROUTINES
                 using (var command = conn.CreateCommand())
                 {
@@ -677,7 +668,7 @@ namespace AyaNova.Util
                     || ExpectedRoutines != actualRoutines
                     || ExpectedViews != actualViews)
                 {
-                    var err = $"E1030 - Database integrity check failed (C{actualColumns}:I{actualIndexes}:CC{actualCheckConstraints}:FC{actualForeignKeyConstraints}:R{actualRoutines}:V{actualViews})";
+                    var err = $"E1030 - Database integrity check failed (C{actualColumns}:I{actualIndexes}:CC{actualCheckConstraints}:FC{actualForeignKeyConstraints}:V{actualViews}:R{actualRoutines})";
                     _log.LogCritical(err);
                     throw new ApplicationException(err);
                 }