More RP support fixes