More fixes to RMP code.