Fix up all the hashing so it's easier