diff --git a/pom.xml b/pom.xml
index 4970666ae..69be3ff11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <name>PlotSquared</name>
     <packaging>jar</packaging>
     <build>
-        <finalName>PlotSquared</finalName>
+        <finalName>PlotSquared-Uber</finalName>
         <sourceDirectory>src/main/java</sourceDirectory>
         <resources>
             <resource>
@@ -67,6 +67,21 @@
                             </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/PS.java b/src/main/java/com/intellectualcrafters/plot/PS.java
index 0398214d5..f14efc858 100644
--- a/src/main/java/com/intellectualcrafters/plot/PS.java
+++ b/src/main/java/com/intellectualcrafters/plot/PS.java
@@ -538,7 +538,7 @@ public class PS {
         List<Plot> overflow = new ArrayList<Plot>(overflowSize);
         for (Plot plot : plots) {
             int hash = MathMan.getPositiveId(plot.hashCode());
-            if (hash < hardmax) {
+            if (hash < hardmax && hash > -1) {
                 cache[hash] = plot;
             }
             else {
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/list.java b/src/main/java/com/intellectualcrafters/plot/commands/list.java
index 125cf91d0..3c1c2c4ae 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/list.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/list.java
@@ -304,7 +304,7 @@ public class list extends SubCommand {
     
     public void displayPlots(PlotPlayer player, List<Plot> plots, int pageSize, int page, String world, String[] args, boolean sort) {
         if (sort) {
-            plots = PS.get().sortPlots(plots, SortType.CREATION_DATE, world);
+            plots = PS.get().sortPlots(plots, SortType.DISTANCE_FROM_ORIGIN, world);
         }
         if (page < 0) {
             page = 0;