diff --git a/src/babashka/impl/ordered.clj b/feature-yaml/babashka/impl/ordered.clj
similarity index 100%
rename from src/babashka/impl/ordered.clj
rename to feature-yaml/babashka/impl/ordered.clj
diff --git a/script/compile b/script/compile
index 69ff04c5..9ab3d181 100755
--- a/script/compile
+++ b/script/compile
@@ -80,6 +80,8 @@ then
     export BABASHKA_FEATURE_CORE_ASYNC=false
     export BABASHKA_FEATURE_CSV=false
     export BABAHSKA_FEATURE_TRANSIT=false
+    export BABASHKA_FEATURE_JAVA_TIME=false
+    export BABASHKA_FEATURE_JAVA_NIO=false
 fi
 
 "$GRAALVM_HOME/bin/native-image" "${args[@]}"
diff --git a/src/babashka/main.clj b/src/babashka/main.clj
index f34237f4..adec274d 100644
--- a/src/babashka/main.clj
+++ b/src/babashka/main.clj
@@ -17,7 +17,6 @@
    [babashka.impl.curl :refer [curl-namespace]]
    [babashka.impl.data :as data]
    [babashka.impl.features :as features]
-   [babashka.impl.ordered :refer [ordered-map-ns]]
    [babashka.impl.pods :as pods]
    [babashka.impl.repl :as repl]
    [babashka.impl.socket-repl :as socket-repl]
@@ -59,7 +58,8 @@
   (require '[babashka.impl.xml]))
 
 (when features/yaml?
-  (require '[babashka.impl.yaml]))
+  (require '[babashka.impl.yaml]
+           '[babashka.impl.ordered]))
 
 (when features/jdbc?
   (require '[babashka.impl.jdbc]))
@@ -368,10 +368,10 @@ If neither -e, -f, or --socket-repl are specified, then the first argument that
        'babashka.curl curl-namespace
        'babashka.pods pods/pods-namespace
        'bencode.core bencode-namespace
-       'flatland.ordered.map ordered-map-ns
        'clojure.java.browse browse-namespace}
     features/xml?  (assoc 'clojure.data.xml @(resolve 'babashka.impl.xml/xml-namespace))
-    features/yaml? (assoc 'clj-yaml.core @(resolve 'babashka.impl.yaml/yaml-namespace))
+    features/yaml? (assoc 'clj-yaml.core @(resolve 'babashka.impl.yaml/yaml-namespace)
+                          'flatland.ordered.map @(resolve 'babashka.impl.ordered/ordered-map-ns))
     features/jdbc? (assoc 'next.jdbc @(resolve 'babashka.impl.jdbc/njdbc-namespace)
                           'next.jdbc.sql @(resolve 'babashka.impl.jdbc/next-sql-namespace))
     features/core-async? (assoc 'clojure.core.async @(resolve 'babashka.impl.async/async-namespace)