diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/RPGRegions.java b/rpgregions/src/main/java/net/islandearth/rpgregions/RPGRegions.java
index d5245d5..bdcc925 100644
--- a/rpgregions/src/main/java/net/islandearth/rpgregions/RPGRegions.java
+++ b/rpgregions/src/main/java/net/islandearth/rpgregions/RPGRegions.java
@@ -241,12 +241,12 @@ public final class RPGRegions extends JavaPlugin implements RPGRegionsAPI, Langu
 			int discoveries = 0;
 			for (OfflinePlayer offlinePlayer : Bukkit.getOfflinePlayers()) {
 				RPGRegionsAccount account = getManagers().getStorageManager().getAccount(offlinePlayer.getUniqueId()).get();
-				discoveries = discoveries + account.getDiscoveredRegions().size();
-				getManagers().getStorageManager().removeCachedAccount(offlinePlayer.getUniqueId()); // Cleanup so we don't use memory
+				discoveries = discoveries + account.getDiscoveredRegions().values().size();
+				if (!offlinePlayer.isOnline()) getManagers().getStorageManager().removeCachedAccount(offlinePlayer.getUniqueId()); // Cleanup so we don't use memory
 			}
 			return discoveries;
 		}));
 
-		metrics.addCustomChart(new Metrics.SimplePie("storage_mode", () -> getConfig().getString("settings.integration.name", getIntegration())));
+		metrics.addCustomChart(new Metrics.SimplePie("storage_mode", () -> getConfig().getString("settings.storage.mode")));
 	}
 }