diff --git a/DynmapCore/src/main/java/org/dynmap/ColorScheme.java b/DynmapCore/src/main/java/org/dynmap/ColorScheme.java
index 2362b9a4..5b382775 100644
--- a/DynmapCore/src/main/java/org/dynmap/ColorScheme.java
+++ b/DynmapCore/src/main/java/org/dynmap/ColorScheme.java
@@ -105,8 +105,8 @@ public class ColorScheme {
                 boolean israin = false;
                 int idx = split[0].indexOf(':');
                 if(idx > 0) {    /* ID:data - data color */
-                    id = new Integer(split[0].substring(0, idx));
-                    dat = new Integer(split[0].substring(idx+1));
+                    id = Integer.parseInt(split[0].substring(0, idx));
+                    dat = Integer.parseInt(split[0].substring(idx+1));
                 }
                 else if(split[0].charAt(0) == '[') {    /* Biome color data */
                     String bio = split[0].substring(1);
@@ -149,7 +149,7 @@ public class ColorScheme {
                     }
                 }
                 else {
-                    id = new Integer(split[0]);
+                    id = Integer.parseInt(split[0]);
                 }
                 if((!isbiome) && (id >= colors.length)) {
                     Color[][] newcolors = new Color[id+1][];
diff --git a/DynmapCore/src/main/java/org/dynmap/storage/MapStorage.java b/DynmapCore/src/main/java/org/dynmap/storage/MapStorage.java
index 2a270bc1..1a29cb03 100644
--- a/DynmapCore/src/main/java/org/dynmap/storage/MapStorage.java
+++ b/DynmapCore/src/main/java/org/dynmap/storage/MapStorage.java
@@ -21,7 +21,7 @@ import org.dynmap.utils.BufferOutputStream;
 public abstract class MapStorage {
     private static Object lock = new Object();
     private static HashMap<String, Integer> filelocks = new HashMap<String, Integer>();
-    private static final Integer WRITELOCK = new Integer(-1);
+    private static final Integer WRITELOCK = (-1);
     protected File baseStandaloneDir;
 
     protected long serverID;