server fixup