diff --git a/Makefile b/Makefile
index a83d0c081a..0b5f708e05 100644
--- a/Makefile
+++ b/Makefile
@@ -374,11 +374,15 @@ ifeq ($(shell expr $(CHPL_MINOR) \= 0),1)
 	ARKOUDA_COMPAT_MODULES += -M $(ARKOUDA_SOURCE_DIR)/compat/eq-20
 endif
 
-ifeq ($(shell expr $(CHPL_MINOR) \> 0),1)
-	ARKOUDA_COMPAT_MODULES += -M $(ARKOUDA_SOURCE_DIR)/compat/ge-21
+ifeq ($(shell expr $(CHPL_MINOR) \= 1),1)
+	ARKOUDA_COMPAT_MODULES += -M $(ARKOUDA_SOURCE_DIR)/compat/eq-21
 endif
 
-ifeq ($(shell expr $(CHPL_MINOR) \>= 0),1)
+ifeq ($(shell expr $(CHPL_MINOR) \>= 2),1)
+	ARKOUDA_COMPAT_MODULES += -M $(ARKOUDA_SOURCE_DIR)/compat/ge-22
+endif
+
+ifeq ($(shell expr $(CHPL_MINOR) \<= 1),1)
 	ARKOUDA_RW_DEFAULT_FLAG := -sOpenReaderLockingDefault=false -sOpenWriterLockingDefault=false
 endif
 
diff --git a/src/ArgSortMsg.chpl b/src/ArgSortMsg.chpl
index 6c69ce9f9b..417f1ba544 100644
--- a/src/ArgSortMsg.chpl
+++ b/src/ArgSortMsg.chpl
@@ -35,7 +35,7 @@ module ArgSortMsg
     private config const logChannel = ServerConfig.logChannel;
     const asLogger = new Logger(logLevel, logChannel);
 
-    proc dynamicTwoArrayRadixSort(ref Data:[], comparator:?rec=defaultComparator) {
+    proc dynamicTwoArrayRadixSort(ref Data:[], comparator:?rec=new DefaultComparator()) {
       if Data._instance.isDefaultRectangular() {
         Sort.TwoArrayRadixSort.twoArrayRadixSort(Data, comparator);
       } else {
diff --git a/src/SegStringSort.chpl b/src/SegStringSort.chpl
index 1c214a6596..9a7a4c5198 100644
--- a/src/SegStringSort.chpl
+++ b/src/SegStringSort.chpl
@@ -29,7 +29,7 @@ module SegStringSort {
   record StringIntComparator {
     proc keyPart((a0,_): (string, int), in i: int) {
       // Just run the default comparator on the string
-      return Sort.defaultComparator.keyPart(a0, i);
+      return (new DefaultComparator()).keyPart(a0, i);
     }
   }
   
diff --git a/src/compat/ge-21/.gitignore b/src/compat/eq-21/.gitignore
similarity index 100%
rename from src/compat/ge-21/.gitignore
rename to src/compat/eq-21/.gitignore
diff --git a/src/compat/ge-22/.gitignore b/src/compat/ge-22/.gitignore
new file mode 100644
index 0000000000..f935021a8f
--- /dev/null
+++ b/src/compat/ge-22/.gitignore
@@ -0,0 +1 @@
+!.gitignore