More fixes to RMP code.
Derp
Herp derp