Some clojure fixes