Minor amends taken from latest RPC files