Fix client from leaking all over the global namespace and breaking multiple requests