Clojure related changes