493: RPC trail improvements