Fixes to support more clojure keywords