Tweaked hash handling