Added RPC server management to context, and other RPC-related enhancements