diff --git a/Plan/bukkit/src/main/java/com/djrapitops/plan/system/importing/importers/BukkitImporter.java b/Plan/bukkit/src/main/java/com/djrapitops/plan/system/importing/importers/BukkitImporter.java
index 8692b0191..25e038d2b 100644
--- a/Plan/bukkit/src/main/java/com/djrapitops/plan/system/importing/importers/BukkitImporter.java
+++ b/Plan/bukkit/src/main/java/com/djrapitops/plan/system/importing/importers/BukkitImporter.java
@@ -167,6 +167,7 @@ public abstract class BukkitImporter implements Importer {
SaveOperations save = dbSystem.getDatabase().save();
+ // TODO Replace with a transaction
save.insertUsers(users);
submitTo(service, () -> save.insertSessions(ImmutableMap.of(serverUUID.get(), sessions), true));
submitTo(service, () -> save.kickAmount(timesKicked));
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/PerServerAggregateQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/PerServerAggregateQueries.java
index c4caa0dc0..185cc67a2 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/PerServerAggregateQueries.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/PerServerAggregateQueries.java
@@ -28,6 +28,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+import static com.djrapitops.plan.db.sql.parsing.Sql.*;
+
/**
* Static method class for queries that count together counts for a player on a per server basis.
*
@@ -51,9 +53,9 @@ public class PerServerAggregateQueries {
public static Query