More fixes for hash functions.