diff --git a/server/src/main/kotlin/org/javacs/kt/index/SymbolIndex.kt b/server/src/main/kotlin/org/javacs/kt/index/SymbolIndex.kt
index f95798157..777fbd690 100644
--- a/server/src/main/kotlin/org/javacs/kt/index/SymbolIndex.kt
+++ b/server/src/main/kotlin/org/javacs/kt/index/SymbolIndex.kt
@@ -93,7 +93,7 @@ class SymbolIndex(
 
     init {
         transaction(db) {
-            SchemaUtils.createMissingTablesAndColumns(Symbols, Locations, Ranges, Positions)
+            SchemaUtils.create(Symbols, Locations, Ranges, Positions)
         }
     }
 
@@ -111,7 +111,7 @@ class SymbolIndex(
                     addDeclarations(allDescriptors(module, exclusions))
 
                     val finished = System.currentTimeMillis()
-                    val count = Symbols.selectAll().first()[Symbols.fqName.count()]
+                    val count = Symbols.select(Symbols.fqName.count()).first()[Symbols.fqName.count()]
                     LOG.info("Updated full symbol index in ${finished - started} ms! (${count} symbol(s))")
                 }
             } catch (e: Exception) {
@@ -134,7 +134,7 @@ class SymbolIndex(
                 addDeclarations(add)
 
                 val finished = System.currentTimeMillis()
-                val count = Symbols.selectAll().first()[Symbols.fqName.count()]
+                val count = Symbols.select(Symbols.fqName.count()).first()[Symbols.fqName.count()]
                 LOG.info("Updated symbol index in ${finished - started} ms! (${count} symbol(s))")
             }
         } catch (e: Exception) {
@@ -149,7 +149,7 @@ class SymbolIndex(
 
             if (validFqName(descriptorFqn) && (extensionReceiverFqn?.let { validFqName(it) } != false)) {
                 Symbols.deleteWhere {
-                    (Symbols.fqName eq descriptorFqn.toString()) and (Symbols.extensionReceiverType eq extensionReceiverFqn?.toString())
+                    (fqName eq descriptorFqn.toString()) and (extensionReceiverType eq extensionReceiverFqn?.toString())
                 }
             } else {
                 LOG.warn("Excluding symbol {} from index since its name is too long", descriptorFqn.toString())
diff --git a/shared/src/main/kotlin/org/javacs/kt/classpath/CachedClassPathResolver.kt b/shared/src/main/kotlin/org/javacs/kt/classpath/CachedClassPathResolver.kt
index 8e0d2b842..c160d29a5 100644
--- a/shared/src/main/kotlin/org/javacs/kt/classpath/CachedClassPathResolver.kt
+++ b/shared/src/main/kotlin/org/javacs/kt/classpath/CachedClassPathResolver.kt
@@ -101,7 +101,7 @@ internal class CachedClassPathResolver(
 
     init {
         transaction(db) {
-            SchemaUtils.createMissingTablesAndColumns(
+            SchemaUtils.create(
                 ClassPathMetadataCache, ClassPathCacheEntry, BuildScriptClassPathCacheEntry
             )
         }
diff --git a/shared/src/main/kotlin/org/javacs/kt/database/DatabaseService.kt b/shared/src/main/kotlin/org/javacs/kt/database/DatabaseService.kt
index 0f80f73b4..b8e53b60d 100644
--- a/shared/src/main/kotlin/org/javacs/kt/database/DatabaseService.kt
+++ b/shared/src/main/kotlin/org/javacs/kt/database/DatabaseService.kt
@@ -37,7 +37,7 @@ class DatabaseService {
         db = getDbFromFile(storagePath)
 
         val currentVersion = transaction(db) {
-            SchemaUtils.createMissingTablesAndColumns(DatabaseMetadata)
+            SchemaUtils.create(DatabaseMetadata)
 
             DatabaseMetadataEntity.all().firstOrNull()?.version ?: 0
         }