diff --git a/project.xml b/project.xml
index 8fd1fe5b..a9eaed1d 100644
--- a/project.xml
+++ b/project.xml
@@ -49,7 +49,8 @@
 
 	<set name="BUILD_DIR" value="export/debug" if="debug" />
 	<set name="BUILD_DIR" value="export/release" unless="debug" />
-	<set name="BUILD_DIR" value="export/32bit" if="32bit" />
+	<set name="BUILD_DIR" value="export/debug-32bit" if="debug 32bit" />
+	<set name="BUILD_DIR" value="export/release-32bit" if="32bit" unless="debug" />
 	<set name="BUILD_DIR" value="latest/" if="beta" />
 
 	<classpath name="source" />
@@ -110,6 +111,9 @@
 	<!-- Comment this out to disable updates !-->
 	<!-- <define name="UPDATE_CHECKING" unless="web || hl || neko"/> -->
 
+	<!-- Fixes thing with hl -->
+	<define name="HL" if="hl"/>
+
 	<!-- Comment this out to disable Discord RPC !-->
 	<define name="DISCORD_RPC" unless="web || hl || neko"/>
 
diff --git a/source/funkin/backend/FunkinSprite.hx b/source/funkin/backend/FunkinSprite.hx
index f8df791b..e0978097 100644
--- a/source/funkin/backend/FunkinSprite.hx
+++ b/source/funkin/backend/FunkinSprite.hx
@@ -125,6 +125,15 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
 	public function measureHit(curMeasure:Int)
 	{
 	}
+
+	/*public override function getScreenBounds(?newRect:FlxRect, ?camera:FlxCamera):FlxRect
+	{
+		__doPreZoomScaleProcedure(camera);
+		var r = super.getScreenBounds(newRect, camera);
+		__doPostZoomScaleProcedure();
+		return r;
+	}*/
+
 	public override function drawComplex(camera:FlxCamera)
 	{
 		super.drawComplex(camera);
diff --git a/source/funkin/backend/system/macros/ScriptsMacro.hx b/source/funkin/backend/system/macros/ScriptsMacro.hx
index ff445e8e..3b8664a6 100644
--- a/source/funkin/backend/system/macros/ScriptsMacro.hx
+++ b/source/funkin/backend/system/macros/ScriptsMacro.hx
@@ -20,14 +20,22 @@ class ScriptsMacro {
 			"flixel.addons.plugin", "flixel.addons.text", "flixel.addons.tile", "flixel.addons.transition",
 			"flixel.addons.util",
 			// OTHER LIBRARIES & STUFF
-			"away3d", "flx3d", #if sys "sys", #end "openfl.net",
-			"funkin.backend.system.net",
+			"away3d", "flx3d",
 			#if VIDEO_CUTSCENES "hxcodec.flixel", "hxcodec.openfl", "hxcodec.lime", #end
 			// BASE HAXE
 			"DateTools", "EReg", "Lambda", "StringBuf", "haxe.crypto", "haxe.display", "haxe.exceptions", "haxe.extern", "scripting"
 		])
 			Compiler.include(inc);
 
+		for(inc in [#if sys "sys", #end "openfl.net", "funkin.backend.system.net"]) {
+			#if !HL
+			Compiler.include(inc);
+			#else
+			// TODO: Hashlink
+			//Compiler.include(inc, ["sys.net.UdpSocket", "openfl.net.DatagramSocket"]); // fixes FATAL ERROR : Failed to load function std@socket_set_broadcast
+			#end
+		}
+
 		// FOR ABSTRACTS
 		Compiler.addGlobalMetadata('haxe.xml', '@:build(hscript.UsingHandler.build())');
 		Compiler.addGlobalMetadata('haxe.CallStack', '@:build(hscript.UsingHandler.build())');
diff --git a/source/funkin/backend/system/modules/CrashHandler.hx b/source/funkin/backend/system/modules/CrashHandler.hx
index 5911c2d9..19c18316 100644
--- a/source/funkin/backend/system/modules/CrashHandler.hx
+++ b/source/funkin/backend/system/modules/CrashHandler.hx
@@ -15,7 +15,7 @@ class CrashHandler {
 		#if cpp
 		untyped __global__.__hxcpp_set_critical_error_handler(onError);
 		#elseif hl
-		Api.setErrorHandler(onError);
+		hl.Api.setErrorHandler(onError);
 		#end
 	}