diff --git a/src/main/java/io/supertokens/storage/postgresql/Start.java b/src/main/java/io/supertokens/storage/postgresql/Start.java
index b4a9e788..2d91c22b 100644
--- a/src/main/java/io/supertokens/storage/postgresql/Start.java
+++ b/src/main/java/io/supertokens/storage/postgresql/Start.java
@@ -1392,6 +1392,7 @@ public int countUsersEnabledTotpAndActiveSince(AppIdentifier appIdentifier, long
         }
     }
     
+    @Override
     public int countUsersEnabledMfa(AppIdentifier appIdentifier) throws StorageQueryException {
         try {
             return ActiveUsersQueries.countUsersEnabledMfa(this, appIdentifier);
diff --git a/src/main/java/io/supertokens/storage/postgresql/config/PostgreSQLConfig.java b/src/main/java/io/supertokens/storage/postgresql/config/PostgreSQLConfig.java
index 15930650..2a7bd5db 100644
--- a/src/main/java/io/supertokens/storage/postgresql/config/PostgreSQLConfig.java
+++ b/src/main/java/io/supertokens/storage/postgresql/config/PostgreSQLConfig.java
@@ -127,7 +127,7 @@ public static Set<String> getValidFields() {
     }
 
     public String getTableSchema() {
-        return postgresql_table_schema.trim();
+        return postgresql_table_schema;
     }
 
     public int getConnectionPoolSize() {
@@ -211,8 +211,7 @@ public String getSessionInfoTable() {
     }
 
     public String getEmailPasswordUserToTenantTable() {
-        String tableName = "emailpassword_user_to_tenant";
-        return addSchemaAndPrefixToTableName(tableName);
+        return addSchemaAndPrefixToTableName("emailpassword_user_to_tenant");
     }
 
     public String getEmailPasswordUsersTable() {