Update code for new RPC interface behaviour + status codes.