diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftGLWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftGLWrapper.java
index d543fcd0e..02eeed0e3 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftGLWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftGLWrapper.java
@@ -30,6 +30,7 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
 
 import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.lwjgl.opengl.GL15;
 import org.lwjgl.opengl.GL32;
 
 
@@ -183,7 +184,7 @@ public class MinecraftGLWrapper implements IMinecraftGLWrapper
 	/** @see GL32#glGenBuffers() */
 	@Override
 	public int glGenBuffers()
-	{ return GlStateManager._glGenBuffers(); }
+	{ return GL32.glGenBuffers(); }
 	
 	/** @see GL32#glDeleteBuffers(int)  */
 	@Override
@@ -199,6 +200,11 @@ public class MinecraftGLWrapper implements IMinecraftGLWrapper
 			// force the delete buffer (and any other in-flight) GL
 			// commands to finish before continuing
 			GL32.glFinish();
+			
+			// James hates this idea.
+			// He kinda hopes it doesn't help,
+			// but maybe metal's API just doesn't finish correctly so we need to wait a moment longer before continuing.
+			try { Thread.sleep(1); } catch (InterruptedException ignore) { }
 		}
 		
 		// MC's implementation has a bug where it will throw:
diff --git a/coreSubProjects b/coreSubProjects
index 5adb9afa0..ce17ac71c 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit 5adb9afa0a36e0b170022ca15c899de2102e5407
+Subproject commit ce17ac71c609514356c55475497138de01869077