diff --git a/lime/graphics/Image.hx b/lime/graphics/Image.hx
index 1bfacad78..26bb440c8 100644
--- a/lime/graphics/Image.hx
+++ b/lime/graphics/Image.hx
@@ -34,7 +34,7 @@ import format.png.Reader;
 import format.png.Tools;
 import format.png.Writer;
 import format.tools.Deflate;
-#if (sys || nodejs)
+#if sys
 import sys.io.File;
 #end
 #end
diff --git a/lime/graphics/format/PNG.hx b/lime/graphics/format/PNG.hx
index 8a632b7b9..b38e95bcd 100644
--- a/lime/graphics/format/PNG.hx
+++ b/lime/graphics/format/PNG.hx
@@ -25,7 +25,7 @@ class PNG {
 			
 			return lime_image_encode (image.buffer, 0, 0);
 			
-		#elseif (!js && format)
+		#elseif (!html5 && format)
 			
 			try {
 				
diff --git a/lime/system/System.hx b/lime/system/System.hx
index b16eeed25..96f121134 100644
--- a/lime/system/System.hx
+++ b/lime/system/System.hx
@@ -306,7 +306,7 @@ class System {
 	
 	private static function tryLoad (name:String, library:String, func:String, args:Int):Dynamic {
 		
-		#if (sys && !html5 || nodejs)
+		#if sys
 		
 		try {
 			
diff --git a/templates/haxe/DefaultAssetLibrary.hx b/templates/haxe/DefaultAssetLibrary.hx
index 422391267..01c5d7f52 100644
--- a/templates/haxe/DefaultAssetLibrary.hx
+++ b/templates/haxe/DefaultAssetLibrary.hx
@@ -12,7 +12,7 @@ import lime.utils.ByteArray;
 import lime.utils.UInt8Array;
 import lime.Assets;
 
-#if (sys || nodejs)
+#if sys
 import sys.FileSystem;
 #end
 
@@ -241,7 +241,7 @@ class DefaultAssetLibrary extends AssetLibrary {
 		// TODO: Complete Lime Font API
 		
 		#if openfl
-		#if (flash || js)
+		#if (flash || html5)
 		
 		return cast (Type.createInstance (className.get (id), []), openfl.text.Font);
 		
@@ -572,7 +572,7 @@ class DefaultAssetLibrary extends AssetLibrary {
 	
 	/*public override function loadMusic (id:String, handler:Dynamic -> Void):Void {
 		
-		#if (flash || js)
+		#if (flash || html5)
 		
 		//if (path.exists (id)) {