fixes to hash map impl