diff --git a/lime/_backend/html5/HTML5Window.hx b/lime/_backend/html5/HTML5Window.hx
index bdbe6b753..f5c29160f 100644
--- a/lime/_backend/html5/HTML5Window.hx
+++ b/lime/_backend/html5/HTML5Window.hx
@@ -44,7 +44,7 @@ class HTML5Window {
 	
 	public var canvas:CanvasElement;
 	public var div:DivElement;
-	public var element:#if (haxe_ver >= "3.2") Element #else HtmlElement #end;
+	public var element:#if (haxe_ver >= 3.2) Element #else HtmlElement #end;
 	#if stats
 	public var stats:Dynamic;
 	#end
diff --git a/lime/app/Config.hx b/lime/app/Config.hx
index 0b8bfe04f..e73859159 100644
--- a/lime/app/Config.hx
+++ b/lime/app/Config.hx
@@ -28,7 +28,7 @@ typedef WindowConfig = {
 	@:optional var depthBuffer:Bool;
 	@:optional var display:Int;
 	#if (js && html5)
-	@:optional var element:#if (haxe_ver >= "3.2") js.html.Element #else js.html.HtmlElement #end;
+	@:optional var element:#if (haxe_ver >= 3.2) js.html.Element #else js.html.HtmlElement #end;
 	#end
 	@:optional var fullscreen:Bool;
 	@:optional var hardware:Bool;
diff --git a/lime/audio/HTML5AudioContext.hx b/lime/audio/HTML5AudioContext.hx
index 1e996d1f6..fab1249bf 100644
--- a/lime/audio/HTML5AudioContext.hx
+++ b/lime/audio/HTML5AudioContext.hx
@@ -56,7 +56,7 @@ class HTML5AudioContext {
 	}
 	
 	
-	#if (haxe_ver < "3.2")
+	#if (haxe_ver < 3.2)
 	public function getAudioDecodedByteCount (buffer:AudioBuffer):Int {
 		
 		#if (js && html5)
@@ -103,7 +103,7 @@ class HTML5AudioContext {
 	}
 	
 	
-	#if (haxe_ver < "3.2")
+	#if (haxe_ver < 3.2)
 	public function getController (buffer:AudioBuffer):Dynamic /*MediaController*/ {
 		
 		#if (js && html5)
@@ -210,7 +210,7 @@ class HTML5AudioContext {
 	}
 	
 	
-	#if (haxe_ver < "3.2")
+	#if (haxe_ver < 3.2)
 	public function getInitialTime (buffer:AudioBuffer):Float {
 		
 		#if (js && html5)
@@ -242,7 +242,7 @@ class HTML5AudioContext {
 	}
 	
 	
-	#if (haxe_ver < "3.2")
+	#if (haxe_ver < 3.2)
 	public function getMediaGroup (buffer:AudioBuffer):String {
 		
 		#if (js && html5)
@@ -491,7 +491,7 @@ class HTML5AudioContext {
 	}
 	
 	
-	#if (haxe_ver < "3.2")
+	#if (haxe_ver < 3.2)
 	public function setController (buffer:AudioBuffer, value:Dynamic /*MediaController*/):Void {
 		
 		#if (js && html5)
@@ -545,7 +545,7 @@ class HTML5AudioContext {
 	}
 	
 	
-	#if (haxe_ver < "3.2")
+	#if (haxe_ver < 3.2)
 	public function setMediaGroup (buffer:AudioBuffer, value:String):Void {
 		
 		#if (js && html5)
diff --git a/lime/project/WindowData.hx b/lime/project/WindowData.hx
index dc8d3e6a8..614993763 100644
--- a/lime/project/WindowData.hx
+++ b/lime/project/WindowData.hx
@@ -25,7 +25,7 @@ typedef WindowData = {
 	@:optional var stencilBuffer:Bool;
 	@:optional var title:String;
 	#if (js && html5)
-	@:optional var element:#if (haxe_ver >= "3.2") js.html.Element #else js.html.HtmlElement #end;
+	@:optional var element:#if (haxe_ver >= 3.2) js.html.Element #else js.html.HtmlElement #end;
 	#end
 	
 }
\ No newline at end of file
diff --git a/lime/system/System.hx b/lime/system/System.hx
index 418b10194..156b47306 100644
--- a/lime/system/System.hx
+++ b/lime/system/System.hx
@@ -10,7 +10,7 @@ import flash.Lib;
 #end
 
 #if (js && html5)
-#if (haxe_ver >= "3.2")
+#if (haxe_ver >= 3.2)
 import js.html.Element;
 #else
 import js.html.HtmlElement;
@@ -49,7 +49,7 @@ class System {
 	@:keep @:expose("lime.embed")
 	public static function embed (element:Dynamic, width:Null<Int> = null, height:Null<Int> = null, background:String = null, assetsPrefix:String = null) {
 		
-		var htmlElement:#if (haxe_ver >= "3.2") Element #else HtmlElement #end = null;
+		var htmlElement:#if (haxe_ver >= 3.2) Element #else HtmlElement #end = null;
 		
 		if (Std.is (element, String)) {
 			
diff --git a/lime/text/Font.hx b/lime/text/Font.hx
index ff1e177c8..785a38e80 100644
--- a/lime/text/Font.hx
+++ b/lime/text/Font.hx
@@ -124,7 +124,7 @@ class Font {
 	}
 	
 	
-	public function getGlyphs (characters:String = #if (display && haxe_ver < "3.2") "" #else "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^`'\"/\\&*()[]{}<>|:;_-+=?,. " #end):Array<Glyph> {
+	public function getGlyphs (characters:String = #if (display && haxe_ver < 3.2) "" #else "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^`'\"/\\&*()[]{}<>|:;_-+=?,. " #end):Array<Glyph> {
 		
 		#if ((cpp || neko || nodejs) && !macro)
 		var glyphs:Dynamic = lime_font_get_glyph_indices (src, characters);