diff --git a/src/main/java/org/dynmap/bukkit/BukkitVersionHelper.java b/src/main/java/org/dynmap/bukkit/BukkitVersionHelper.java
index f0cdb6ad..3c65ffc9 100644
--- a/src/main/java/org/dynmap/bukkit/BukkitVersionHelper.java
+++ b/src/main/java/org/dynmap/bukkit/BukkitVersionHelper.java
@@ -90,7 +90,7 @@ public abstract class BukkitVersionHelper {
     /** 
      * Get tile entities map from chunk
      */
-    public abstract Map getTileEntitiesForChunk(Chunk c);
+    public abstract Map<?, ?> getTileEntitiesForChunk(Chunk c);
     /**
      * Get X coordinate of tile entity
      */
diff --git a/src/main/java/org/dynmap/bukkit/BukkitVersionHelperGeneric.java b/src/main/java/org/dynmap/bukkit/BukkitVersionHelperGeneric.java
index 0b5cb184..54d98c3b 100644
--- a/src/main/java/org/dynmap/bukkit/BukkitVersionHelperGeneric.java
+++ b/src/main/java/org/dynmap/bukkit/BukkitVersionHelperGeneric.java
@@ -24,8 +24,8 @@ public abstract class BukkitVersionHelperGeneric extends BukkitVersionHelper {
     protected String nms_package; // Package used for net.minecraft.server
     private boolean failed;
     protected static final Object[] nullargs = new Object[0];
-    protected static final Class[] nulltypes = new Class[0];
-    private static final Map nullmap = Collections.emptyMap();
+    protected static final Class<?>[] nulltypes = new Class[0];
+    private static final Map<?, ?> nullmap = Collections.emptyMap();
     
     /** CraftChunkSnapshot */
     private Class<?> craftchunksnapshot;
@@ -249,7 +249,7 @@ public abstract class BukkitVersionHelperGeneric extends BukkitVersionHelper {
     /**
      * Get method
      */
-    protected Method getMethod(Class<?> cls, String[] ids, Class[] args) {
+    protected Method getMethod(Class<?> cls, String[] ids, Class<?>[] args) {
         if(cls == null) return null;
         for(String id : ids) {
             try {
@@ -262,7 +262,7 @@ public abstract class BukkitVersionHelperGeneric extends BukkitVersionHelper {
         failed = true;
         return null;
     }
-    protected Method getMethodNoFail(Class<?> cls, String[] ids, Class[] args) {
+    protected Method getMethodNoFail(Class<?> cls, String[] ids, Class<?>[] args) {
         if(cls == null) return null;
         for(String id : ids) {
             try {
@@ -360,10 +360,10 @@ public abstract class BukkitVersionHelperGeneric extends BukkitVersionHelper {
     }
 
     /** Get tile entities map from chunk */
-    public Map getTileEntitiesForChunk(Chunk c) {
+    public Map<?, ?> getTileEntitiesForChunk(Chunk c) {
         Object omsc = callMethod(c, cc_gethandle, nullargs, null);
         if(omsc != null) {
-            return (Map)getFieldValue(omsc, nmsc_tileentities, nullmap);
+            return (Map<?, ?>)getFieldValue(omsc, nmsc_tileentities, nullmap);
         }
         return nullmap;
     }
diff --git a/src/main/java/org/dynmap/bukkit/BukkitVersionHelperGlowstone.java b/src/main/java/org/dynmap/bukkit/BukkitVersionHelperGlowstone.java
index d15574a7..a25e4fe9 100644
--- a/src/main/java/org/dynmap/bukkit/BukkitVersionHelperGlowstone.java
+++ b/src/main/java/org/dynmap/bukkit/BukkitVersionHelperGlowstone.java
@@ -98,7 +98,7 @@ public class BukkitVersionHelperGlowstone extends BukkitVersionHelper {
     }
 
     @Override
-    public Map getTileEntitiesForChunk(Chunk c) {
+    public Map<?, ?> getTileEntitiesForChunk(Chunk c) {
         // TODO Auto-generated method stub
         return Collections.emptyMap();
     }