diff --git a/.haxerc b/.haxerc
index e2cb3ffe..bcb0f652 100644
--- a/.haxerc
+++ b/.haxerc
@@ -1,4 +1,4 @@
 {
-  "version": "b1b235b",
+  "version": "8878b58",
   "resolveLibs": "scoped"
 }
diff --git a/haxe_libraries/hxnodejs.hxml b/haxe_libraries/hxnodejs.hxml
index 577e96a5..3c42b6ce 100644
--- a/haxe_libraries/hxnodejs.hxml
+++ b/haxe_libraries/hxnodejs.hxml
@@ -1,6 +1,6 @@
-# @install: lix --silent download "haxelib:/hxnodejs#12.1.0" into hxnodejs/12.1.0/haxelib
--cp ${HAXE_LIBCACHE}/hxnodejs/12.1.0/haxelib/src
--D hxnodejs=12.1.0
+# @install: lix --silent download "github:HaxeFoundation/hxnodejs#504066d" into hxnodejs/12.2.0/haxelib
+-cp ${HAXE_LIBCACHE}/hxnodejs/12.2.0/haxelib/src
+-D hxnodejs=12.2.0
 --macro allowPackage('sys')
 # should behave like other target defines and not be defined in macro context
 --macro define('nodejs')
diff --git a/src/haxeLanguageServer/features/haxe/RenameFeature.hx b/src/haxeLanguageServer/features/haxe/RenameFeature.hx
index 7b34a00f..c9cc3096 100644
--- a/src/haxeLanguageServer/features/haxe/RenameFeature.hx
+++ b/src/haxeLanguageServer/features/haxe/RenameFeature.hx
@@ -342,16 +342,16 @@ class LanguageServerTyper implements ITyper {
 		}
 		var reg = ~/Class<(.*)>/;
 
-		var type = item!.item!.type;
+		var type = item?.item?.type;
 		if (type == null) {
 			return null;
 		}
-		var path = type!.args!.path;
+		var path = type?.args?.path;
 		if (path == null) {
 			return null;
 		}
 		if (path.moduleName == "StdTypes" && path.typeName == "Null") {
-			var params = type!.args!.params;
+			var params = type?.args?.params;
 			if (params == null) {
 				return null;
 			}
@@ -359,7 +359,7 @@ class LanguageServerTyper implements ITyper {
 			if (type == null) {
 				return null;
 			}
-			path = type!.args!.path;
+			path = type?.args?.path;
 			if (path == null) {
 				return null;
 			}
diff --git a/src/haxeLanguageServer/features/haxe/codeAction/OrganizeImportsFeature.hx b/src/haxeLanguageServer/features/haxe/codeAction/OrganizeImportsFeature.hx
index 5755e54f..615a5278 100644
--- a/src/haxeLanguageServer/features/haxe/codeAction/OrganizeImportsFeature.hx
+++ b/src/haxeLanguageServer/features/haxe/codeAction/OrganizeImportsFeature.hx
@@ -321,7 +321,7 @@ private enum abstract ImportType(Int) {
 	public function opLt(val:ImportType):Bool;
 
 	@:op(a > b)
-	public function opLt(val:ImportType):Bool;
+	public function opGt(val:ImportType):Bool;
 }
 
 private typedef ImportSortFunction = (a:ImportInfo, b:ImportInfo) -> Int;