More preparations for making xmlrpc connect to master