Fixed another bunch of hashing bugs.