Small fixes to ensure invariants are the same in Clojure as in Java