RPC security tweaks