Fixing some hashing issues.