Replace sharded hash function/misc mods