client fixup