Redo longhash tweaks