diff --git a/pom.xml b/pom.xml
index 13931d969..9d02bafae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
+		<java.version>1.10</java.version>
 		<powermock.version>1.7.4</powermock.version>
 	</properties>
 
@@ -126,7 +126,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.7.0</version>
+				<version>3.8.0</version>
 				<configuration>
 					<source>${java.version}</source>
 					<target>${java.version}</target>
@@ -142,6 +142,7 @@
 				<artifactId>maven-jar-plugin</artifactId>
 				<version>3.1.0</version>
 			</plugin>
+			<!--
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
@@ -159,7 +160,7 @@
 						</goals>
 					</execution>
 				</executions>
-			</plugin>
+			</plugin> -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
@@ -173,10 +174,11 @@
 					</execution>
 				</executions>
 			</plugin>
+			<!-- 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.1.0</version>
+				<version>3.2.0</version>
 				<configuration>
 					<minimizeJar>true</minimizeJar>
 					<relocations>
@@ -199,7 +201,7 @@
 						</goals>
 					</execution>
 				</executions>
-			</plugin>
+			</plugin> -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-install-plugin</artifactId>
diff --git a/src/main/java/world/bentobox/bentobox/BentoBox.java b/src/main/java/world/bentobox/bentobox/BentoBox.java
index 2cd6f6461..023446959 100644
--- a/src/main/java/world/bentobox/bentobox/BentoBox.java
+++ b/src/main/java/world/bentobox/bentobox/BentoBox.java
@@ -130,11 +130,12 @@ public void onEnable(){
             instance.log("#############################################");
 
             // Load metrics
+            /*
             if (settings.isMetrics()) {
                 BStats bStats = new BStats(this);
                 bStats.registerMetrics();
             }
-
+             */
             // Fire plugin ready event
             Bukkit.getServer().getPluginManager().callEvent(new BentoBoxReadyEvent());
         });
diff --git a/src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java b/src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java
index 141b7db33..5689df7a0 100644
--- a/src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java
+++ b/src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java
@@ -113,20 +113,24 @@ public Class<?> findClass(String name, boolean checkGlobal) {
         if (name.startsWith("world.bentobox.bentobox")) {
             return null;
         }
+        Class<?> result = classes.get(name);
+        if (result == null) {
+            if (checkGlobal) {
+                result = loader.getClassByName(name);
+            }
 
-        Class<?> result = classes.computeIfAbsent(name, k -> {
-            if (checkGlobal && loader.getClassByName(name) != null) {
-                return loader.getClassByName(name);
-            } else {
+            if (result == null) {
                 try {
-                    return super.findClass(name);
+                    result = super.findClass(name);
                 } catch (ClassNotFoundException e) {
-                    return null;
+                    result = null;
+                }
+                if (result != null) {
+                    loader.setClass(name, result);
+
                 }
             }
-        });
-        if (result != null) {
-            loader.setClass(name, result);
+            classes.put(name, result);
         }
         return result;
     }