Updated xmlrpc patch to address comments