more hash support tweaks