Fixes to Clojure codec generator