tweaks to avoid slow hash table warnings