Fix glitches in recent hash table changes