Make hasher play nice with mode switching, clean up