diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/InspectCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/InspectCommand.java
index c6e141feb..50ac77269 100644
--- a/Plan/src/main/java/com/djrapitops/plan/command/commands/InspectCommand.java
+++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/InspectCommand.java
@@ -59,7 +59,7 @@ public class InspectCommand extends SubCommand {
                 sCol + "  Alias: /plan <name>"
         };
 
-        setInDepthHelp(help);
+        super.setInDepthHelp(help);
     }
 
     @Override
diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java
index b595e9acd..d2180991d 100644
--- a/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java
+++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java
@@ -87,17 +87,19 @@ public class CommandUseTable extends Table {
         Map<String, Integer> newData = new HashMap<>(data);
         Map<String, Integer> saved = getCommandUse();
         newData.keySet().removeAll(saved.keySet());
+
         insertCommands(newData);
+
         Map<String, Integer> updateData = new HashMap<>(data);
         updateData.keySet().removeAll(newData.keySet());
-        for (Map.Entry<String, Integer> entrySet : saved.entrySet()) {
-            String cmd = entrySet.getKey();
-            Integer toSave = entrySet.getValue();
+
+        for (String cmd : saved.keySet()) {
+            // IMPORTANT - not using saved as value
+            Integer toSave = updateData.get(cmd);
 
             if (toSave == null || toSave > saved.get(cmd)) {
                 continue;
             }
-
             updateData.remove(cmd);
         }
 
diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/GMTimesTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/GMTimesTable.java
index 5526f2bec..45ed051bc 100644
--- a/Plan/src/main/java/com/djrapitops/plan/database/tables/GMTimesTable.java
+++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/GMTimesTable.java
@@ -260,16 +260,16 @@ public class GMTimesTable extends Table {
                             + columnSpectatorTime
                             + ") VALUES (?, ?, ?, ?, ?)");
             boolean commitRequired = false;
-            for (Map.Entry<Integer, Map<String, Long>> entrySet : gamemodeTimes.entrySet()) {
-                Integer id = entrySet.getKey();
+            for (Map.Entry<Integer, Map<String, Long>> entry : gamemodeTimes.entrySet()) {
+                Integer id = entry.getKey();
 
                 statement.setInt(1, id);
                 for (int i = 0; i < gms.length; i++) {
                     try {
-                        Map<String, Long> times = entrySet.getValue();
+                        Map<String, Long> times = entry.getValue();
                         Long time = times.get(gms[i]);
 
-                        statement.setLong(i + 1, time != null ? time : 0);
+                        statement.setLong(i + 2, time != null ? time : 0);
                     } catch (NoSuchFieldError e) {
                         statement.setLong(i + 2, 0);
                     }
diff --git a/Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebSocketServer.java b/Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebSocketServer.java
index e79485139..d3168981f 100644
--- a/Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebSocketServer.java
+++ b/Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebSocketServer.java
@@ -88,7 +88,7 @@ public class WebSocketServer {
                 trustManagerFactory.init(keystore);
 
                 server = HttpsServer.create(new InetSocketAddress(port), 10);
-                SSLContext sslContext = SSLContext.getInstance("SSL");
+                SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
                 sslContext.init(keyManagerFactory.getKeyManagers(), null/*trustManagerFactory.getTrustManagers()*/, null);
 
                 ((HttpsServer) server).setHttpsConfigurator(new HttpsConfigurator(sslContext) {
diff --git a/Plan/src/test/java/main/java/com/djrapitops/plan/utilities/FormatUtilsTest.java b/Plan/src/test/java/main/java/com/djrapitops/plan/utilities/FormatUtilsTest.java
index 69f83f25a..4e34b2116 100644
--- a/Plan/src/test/java/main/java/com/djrapitops/plan/utilities/FormatUtilsTest.java
+++ b/Plan/src/test/java/main/java/com/djrapitops/plan/utilities/FormatUtilsTest.java
@@ -34,7 +34,8 @@ public class FormatUtilsTest {
      *
      */
     @Before
-    public void setUp() {
+    public void setUp() throws Exception{
+        TestInit.init();
     }
 
     /**