Fixed some issues with the hash table