diff --git a/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataFileHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataFileHandler.java
index f4dfb459f..0edd49c92 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataFileHandler.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataFileHandler.java
@@ -550,6 +550,9 @@ public class FullDataFileHandler implements IFullDataSourceProvider
 	//=========//
 	
 	@Override
-	public void close() { FullDataMetaFile.checkAndLogPhantomDataSourceLifeCycles(); }
+	public void close() {
+		FullDataMetaFile.checkAndLogPhantomDataSourceLifeCycles();
+		this.fullDataRepo.close();
+	}
 	
 }
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderSourceFileHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderSourceFileHandler.java
index 681e80c8f..f6ef01654 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderSourceFileHandler.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderSourceFileHandler.java
@@ -313,6 +313,7 @@ public class RenderSourceFileHandler implements IRenderSourceProvider
 		LOGGER.info("Closing " + this.getClass().getSimpleName() + " with [" + this.loadedMetaFileBySectionPos.size() + "] files...");
 		this.fileHandlerThreadPool.shutdown();
 		this.threadPoolMsg.close();
+		this.renderDataRepo.close();
 	}
 	
 	public void deleteRenderCache()
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/sql/AbstractDhRepo.java b/core/src/main/java/com/seibel/distanthorizons/core/sql/AbstractDhRepo.java
index bc0684074..a694b7621 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/sql/AbstractDhRepo.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/sql/AbstractDhRepo.java
@@ -278,6 +278,7 @@ public abstract class AbstractDhRepo<TDTO extends IBaseDTO>
 			{
 				if(this.connection != null)
 				{
+					CONNECTIONS_BY_CONNECTION_STRING.remove(this.connectionString);
 					this.connection.close();
 				}
 				ACTIVE_CONNECTION_STRINGS_BY_REPO.remove(this);