diff --git a/pom.xml b/pom.xml
index 06ebb9659..4ee2c8575 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,48 @@
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
                 <executions>
-		
+					<execution>
+                        <id>bukkit</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <finalName>PlotSquared-Bukkit</finalName>
+                            <excludes>
+                                <exclude>**/com/plotsquared/sponge/**</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>sponge</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <finalName>PlotSquared-Sponge</finalName>
+                            <excludes>
+                                <exclude>**/com/plotsquared/bukkit/**</exclude>
+                                <exclude>**/com/intellectualcrafters/plot/api/*</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>api</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <finalName>PlotSquared-Null</finalName>
+                            <excludes>
+                                <exclude>**/com/plotsquared/bukkit/**</exclude>
+                                <exclude>**/com/plotsquared/sponge/**</exclude>
+                                <exclude>**/com/intellectualcrafters/plot/api/*</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
diff --git a/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java b/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java
index 3e1f957f7..f06ee9a37 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java
@@ -188,7 +188,13 @@ public class ExpireManager {
                 last = dates.get(uuid);
             }
             else {
-                final OfflinePlayer op = Bukkit.getOfflinePlayer(name);
+                OfflinePlayer op;
+                if (Settings.TWIN_MODE_UUID) {
+                    op = Bukkit.getOfflinePlayer(uuid);
+                }
+                else {
+                    op = Bukkit.getOfflinePlayer(name);
+                }
                 if (op.hasPlayedBefore()) {
                     last = op.getLastPlayed();
                     dates.put(uuid, last);
diff --git a/src/main/java/com/plotsquared/bukkit/uuid/FileUUIDHandler.java b/src/main/java/com/plotsquared/bukkit/uuid/FileUUIDHandler.java
index a1a17ad39..920c60d8f 100644
--- a/src/main/java/com/plotsquared/bukkit/uuid/FileUUIDHandler.java
+++ b/src/main/java/com/plotsquared/bukkit/uuid/FileUUIDHandler.java
@@ -174,11 +174,13 @@ public class FileUUIDHandler extends UUIDHandlerImplementation {
 
                 if (getUUIDMap().size() == 0) {
                     for (OfflinePlotPlayer op : uuidWrapper.getOfflinePlayers()) {
-                        if (op.getLastPlayed() != 0) {
+                        long last = op.getLastPlayed();
+                        if (last != 0) {
                             String name = op.getName();
                             StringWrapper wrap = new StringWrapper(name);
                             UUID uuid = uuidWrapper.getUUID(op);
                             toAdd.put(wrap, uuid);
+                            ExpireManager.dates.put(uuid, last);
                         }
                     }
                 }