Small fixes to hash table