diff --git a/src/openfl/display/Shader.hx b/src/openfl/display/Shader.hx
index c12c12adb2..e24c8d0648 100644
--- a/src/openfl/display/Shader.hx
+++ b/src/openfl/display/Shader.hx
@@ -904,11 +904,10 @@ class Shader
 
 						Reflect.setField(__data, name, parameter);
 
-						if (__isGenerated && thisHasField(name)) Reflect.setProperty(this, name, parameter);
-
 						try
 						{
 							if (__isGenerated) Reflect.setField(this, name, parameter);
+							if (__isGenerated && thisHasField(name)) Reflect.setProperty(this, name, parameter);
 						}
 						catch (e:Dynamic)
 						{
diff --git a/src/openfl/net/FileReferenceList.hx b/src/openfl/net/FileReferenceList.hx
index 46d2c9a5e4..3b71576bb8 100644
--- a/src/openfl/net/FileReferenceList.hx
+++ b/src/openfl/net/FileReferenceList.hx
@@ -1,7 +1,7 @@
 package openfl.net;
 
 #if !flash
-#if cpp
+#if (cpp || hl)
 import haxe.io.Path;
 import openfl.events.Event;
 import openfl.events.EventDispatcher;