patches to broken domain-server pool and payload passing