Fix linked hash map issues