More RPM limit fixes