diff --git a/src/main/java/org/replicadb/manager/OracleManager.java b/src/main/java/org/replicadb/manager/OracleManager.java
index 5ad36ef..858fb09 100644
--- a/src/main/java/org/replicadb/manager/OracleManager.java
+++ b/src/main/java/org/replicadb/manager/OracleManager.java
@@ -56,9 +56,7 @@ else if (options.getSourceWhere() != null && !options.getSourceWhere().isEmpty()
                     escapeTableName(tableName) + " where ora_hash(rowid," + (options.getJobs() - 1) + ") = ?";
         }
 
-
-        LOG.debug("Reading table with command: " + sqlCmd);
-        return super.execute(sqlCmd, nThread);
+        return super.execute(sqlCmd, (Object) nThread);
     }
 
     private void oracleAlterSession(Boolean directRead) throws SQLException {
diff --git a/src/main/java/org/replicadb/manager/PostgresqlManager.java b/src/main/java/org/replicadb/manager/PostgresqlManager.java
index 977d531..4115419 100644
--- a/src/main/java/org/replicadb/manager/PostgresqlManager.java
+++ b/src/main/java/org/replicadb/manager/PostgresqlManager.java
@@ -183,7 +183,7 @@ protected void createStagingTable() throws SQLException {
         Statement statement = this.getConnection().createStatement();
         String sinkStagingTable = getQualifiedStagingTableName();
 
-        String sql = "CREATE UNLOGGED TABLE IF NOT EXISTS " + sinkStagingTable + " ( LIKE " + this.getSinkTableName() + " INCLUDING DEFAULTS INCLUDING CONSTRAINTS )";
+        String sql = "CREATE UNLOGGED TABLE IF NOT EXISTS " + sinkStagingTable + " ( LIKE " + this.getSinkTableName() + " INCLUDING DEFAULTS INCLUDING CONSTRAINTS ) WITH (autovacuum_enabled=false)";
 
         LOG.info("Creating staging table with this command: " + sql);
         statement.executeUpdate(sql);
diff --git a/src/main/java/org/replicadb/manager/SqlManager.java b/src/main/java/org/replicadb/manager/SqlManager.java
index d353d0b..577a80c 100644
--- a/src/main/java/org/replicadb/manager/SqlManager.java
+++ b/src/main/java/org/replicadb/manager/SqlManager.java
@@ -447,10 +447,15 @@ public void postSinkTasks() throws SQLException {
 
     @Override
     public void cleanUp() throws SQLException {
-        // Only drop staging table if it was created automatically
-        if (options.getSinkStagingTable() == null || options.getSinkStagingTable().isEmpty()) {
-            // Drop staging table
-            this.dropStagingTable();
+
+        // On INCREMENTAL mode
+        if (options.getMode().equals(ReplicationMode.INCREMENTAL.getModeText())) {
+
+            // Only drop staging table if it was created automatically
+            if (options.getSinkStagingTable() == null || options.getSinkStagingTable().isEmpty()) {
+                // Drop staging table
+                this.dropStagingTable();
+            }
         }
 
     }