More fixes for Hashtable tuple change