Fixed some hashing and wrapper bugs