More RPM tweaks.