RR 2.5.4 changes

Broke a lot in this one.

*sigh*