Bug fixes to Hash Table