Fix hashing problems, hopefully