Fix HashMap references