fix up before clojure conversion