more fixes for hashing