Minor Changes so HashMaps work on mac