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 1444d75fc..5dbdc63fd 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
@@ -68,13 +68,13 @@ public class FullDataFileHandler implements IFullDataSourceProvider
 		for (DhSectionPos pos : posList)
 		{
 			map.put(pos,
-					metaFileBySectionPos.containsKey(pos) ? 3 // Loaded
+					loadedMetaFileBySectionPos.containsKey(pos) ? 3 // Loaded
 					: this.isFileUnloaded(pos) ? 2            // Unloaded
 					: 1);                                     // Not generated
 		}
 		return map;
 	}
-	protected boolean isFileUnloaded(DhSectionPos pos) { return unloadedFileBySectionPos.containsKey(pos); }
+	protected boolean isFileUnloaded(DhSectionPos pos) { return !loadedMetaFileBySectionPos.containsKey(pos); }
 	
 	protected final IDhLevel level;
 	protected final File saveDir;
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldRemoteGenerationQueue.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldRemoteGenerationQueue.java
index c21ac1890..707d11dd6 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldRemoteGenerationQueue.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldRemoteGenerationQueue.java
@@ -80,7 +80,7 @@ public class WorldRemoteGenerationQueue implements IWorldGenerationQueue, IDebug
 	}
 	
 	@Override
-	public void runCurrentGenTasksUntilBusy(DhBlockPos2D targetPos)
+	public void startGenerationQueueAndSetTargetPos(DhBlockPos2D targetPos)
 	{
 		if (generatorClosingFuture != null || !networkState.getClient().isReady()) return;