Fixed Common Lisp and Clojure support