Tweaks to hash functions in `Helper`