Hashtable fixes